refactor: migrate installer scripts to XDG paths and harden POSIX

install.sh:
- Add set -eu; use WORKDIR=$(mktemp -d) with safe trap cleanup
- Replace ~/.zi with XDG_DATA_HOME-aware path
- Fix sed command for ZI[STREAM] substitution
- Correct cd fallback from return to exit 1
- Guard branch pull with BOPT; add exit 1 on failed clone
- Fix .zshrc loader snippet variable quoting

install_zpmod.sh:
- Add set -eu, file header and WORKDIR trap
- Add pure-POSIX _zi_ver_ge() replacing expr string comparison
- Honour XDG_DATA_HOME for ZI_HOME default
- Replace exit 255 with exit 1 throughout

lib/zsh/init.zsh:
- Update default branch to use ZI[STREAM] parameter
- Align loader paths with XDG layout

Author: ss-o

lib/sh/install.sh

@@ -2,8 +2,10 @@
 # -*- mode: sh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
 # vim: ft=sh sw=2 ts=2 et
 
-trap 'rm -rf "$WORKDIR"' EXIT INT
-WORKDIR="$(mktemp -d)"
+set -eu
+
+WORKDIR="$(mktemp -d)" || exit 1
+trap 'rm -rf "${WORKDIR:?}"' EXIT INT TERM
 ZOPT=""
 AOPT=""
 BOPT="main"
@@ -43,21 +45,21 @@ if [ "${AOPT}" = loader ]; then
     command wget -qO "${ZI_CONFIG_DIR}/init.zsh" https://raw.githubusercontent.com/z-shell/zi-src/main/lib/zsh/init.zsh
   fi
   command chmod go-w "${ZI_CONFIG_DIR}" && command chmod a+x "${ZI_CONFIG_DIR}/init.zsh"
-  command sed -i "s/branch=\"main\"/branch=\"${BOPT}\"/g" "${ZI_CONFIG_DIR}/init.zsh"
+  # shellcheck disable=SC2016
+  command sed -i 's|: ${ZI\[STREAM\]:="main"}|: ${ZI[STREAM]:="'"${BOPT}"'"}|' "${ZI_CONFIG_DIR}/init.zsh"
 fi
 
-if [ -z "${ZI_HOME}" ]; then
-  ZI_HOME="${ZDOTDIR:-${HOME}}/.zi"
+if [ -z "${ZI_HOME-}" ]; then
+  ZI_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zi"
 fi
 
-if [ -z "${ZI_BIN_DIR_NAME}" ]; then
+if [ -z "${ZI_BIN_DIR_NAME-}" ]; then
   ZI_BIN_DIR_NAME="bin"
 fi
 
 if ! test -d "${ZI_HOME}"; then
   command mkdir "${ZI_HOME}"
   command chmod go-w "${ZI_HOME}"
-  command chmod go-w "${ZI_HOME}/${ZI_BIN_DIR_NAME}"
 fi
 
 if ! command -v git >/dev/null 2>&1; then
@@ -68,31 +70,32 @@ fi
 # Get the download-progress bar tool
 if command -v curl >/dev/null 2>&1; then
   command mkdir -p /tmp/zi
-  cd /tmp/zi || return
+  cd /tmp/zi || exit 1
   command curl -fsSLO https://raw.githubusercontent.com/z-shell/zi/main/lib/zsh/git-process-output.zsh &&
     command chmod a+x /tmp/zi/git-process-output.zsh
 elif command -v wget >/dev/null 2>&1; then
   command mkdir -p /tmp/zi
-  cd /tmp/zi || return
+  cd /tmp/zi || exit 1
   command wget -q https://raw.githubusercontent.com/z-shell/zi/main/lib/zsh/git-process-output.zsh &&
     command chmod a+x /tmp/zi/git-process-output.zsh
 fi
 
 if test -d "${ZI_HOME}/${ZI_BIN_DIR_NAME}/.git"; then
-  cd "${ZI_HOME}/${ZI_BIN_DIR_NAME}" || return
+  cd "${ZI_HOME}/${ZI_BIN_DIR_NAME}" || exit 1
   printf '%s\n' "▓▒░ Updating (z-shell/zi) plugin manager at ${ZI_HOME}/${ZI_BIN_DIR_NAME}"
   command git clean -d -f -f
   command git reset --hard HEAD
-  command git pull -q origin HEAD
+  command git pull -q origin "${BOPT}"
 else
-  cd "${ZI_HOME}" || return
+  cd "${ZI_HOME}" || exit 1
   printf '%s\n' "▓▒░ Installing (z-shell/zi) plugin manager at ${ZI_HOME}/${ZI_BIN_DIR_NAME}"
   { git clone --progress --depth=1 --branch "${BOPT}" https://github.com/z-shell/zi.git "${ZI_BIN_DIR_NAME}" \
     2>&1 | { /tmp/zi/git-process-output.zsh || cat; }; } 2>/dev/null
-  if [ -d "${ZI_BIN_DIR_NAME}" ]; then
+  if [ -d "${ZI_HOME}/${ZI_BIN_DIR_NAME}" ]; then
     printf '%s\n' "▓▒░ Successfully installed at ${ZI_HOME}/${ZI_BIN_DIR_NAME}".
   else
     printf '%s\n' "▓▒░ Something went wrong, couldn't install ZI at ${ZI_HOME}/${ZI_BIN_DIR_NAME}"
+    exit 1
   fi
 fi
 
@@ -106,7 +109,7 @@ MAIN_PROFILE() {
     printf '%s\n' "▓▒░ Seems that .zshrc already has content or setup skipped - no changes will be made."
     ZOPT='skip'
   fi
-  if [ "${ZOPT}" != skip ]; then
+  if [ "${ZOPT}" != skip ] && [ "${AOPT}" != loader ]; then
     printf '%s\n' "▓▒░ Updating ${THE_ZDOTDIR}/.zshrc"
     ZI_HOME="$(echo "${ZI_HOME}" | sed "s|${HOME}|\$HOME|")"
     command cat <<-EOF >>"${THE_ZDOTDIR}/.zshrc"
@@ -126,10 +129,9 @@ EOF
     printf '%s\n' "▓▒░ Minimal configuration"
   fi
   if [ "${AOPT}" = loader ] && [ "${ZOPT}" != skip ]; then
-    command rm -rf "${THE_ZDOTDIR}/.zshrc"
     command cat <<-EOF >>"${THE_ZDOTDIR}/.zshrc"
-if [[ -r "${XDG_CONFIG_HOME:-${HOME}/.config}/zi/init.zsh" ]]; then
-  source "${XDG_CONFIG_HOME:-${HOME}/.config}/zi/init.zsh" && zzinit
+if [[ -r "\${XDG_CONFIG_HOME:-\${HOME}/.config}/zi/init.zsh" ]]; then
+  source "\${XDG_CONFIG_HOME:-\${HOME}/.config}/zi/init.zsh" && zzinit
 fi
 EOF
     printf '%s\n' "▓▒░ Loader added"
@@ -164,86 +166,38 @@ EOF
   fi
 }
 
-SETUP_ZPMOD() {
-  if ! test -d "${ZI_HOME}/${MOD_HOME}"; then
-    command mkdir -p "${ZI_HOME}/${MOD_HOME}"
-    command chmod go-w "${ZI_HOME}/${MOD_HOME}"
-  fi
+ZPMOD_PROFILE() {
+  _zpmod_sh=""
+  case "$0" in
+  */*)
+    _script_dir="$(cd "$(dirname "$0")" 2>/dev/null && pwd)" || _script_dir=""
+    ;;
+  *)
+    _script_dir=""
+    ;;
+  esac
 
-  printf '%s\n' "${col_pname}== Downloading ZPMOD module to ${ZI_HOME}/${MOD_HOME}"
-  if test -d "${ZI_HOME}/${MOD_HOME}/.git"; then
-    cd "${ZI_HOME}/${MOD_HOME}" || return
-    git pull -q origin main
+  if [ -n "${_script_dir}" ] && [ -f "${_script_dir}/install_zpmod.sh" ]; then
+    _zpmod_sh="${_script_dir}/install_zpmod.sh"
   else
-    cd "${ZI_HOME}" || return
-    git clone -q https://github.com/z-shell/zpmod.git "${MOD_HOME}"
-  fi
-  printf '%s\n' "${col_pname}== Done"
-}
-
-BUILD_ZPMOD() {
-  if command -v zsh >/dev/null; then
-    printf '%s\n' "${col_info2}-- Checkig version --${col_rst}"
-    ZSH_CURRENT=$(zsh --version </dev/null | head -n1 | cut -d" " -f2,6- | tr -d '-')
-    ZSH_REQUIRED="5.8.1"
-    if expr "${ZSH_CURRENT}" \< "${ZSH_REQUIRED}" >/dev/null; then
-      printf '%s\n' "${col_error}-- Zsh version 5.8.1 and above required --${col_rst}"
-      exit 1
+    _zpmod_sh="${WORKDIR}/install_zpmod.sh"
+    _zpmod_url="https://raw.githubusercontent.com/z-shell/zi-src/main/lib/sh/install_zpmod.sh"
+    if command -v curl >/dev/null 2>&1; then
+      command curl -fsSL "${_zpmod_url}" -o "${_zpmod_sh}"
+    elif command -v wget >/dev/null 2>&1; then
+      command wget -qO "${_zpmod_sh}" "${_zpmod_url}"
     else
-      printf '%s\n' "${col_info2}-- Zsh version ${ZSH_CURRENT} --${col_rst}"
-      cd "${ZI_HOME}/${MOD_HOME}" || return
-      printf '%s\n' "${col_pname}== Building module ZPMOD, running: a make clean, then ./configure and then make ==${col_rst}"
-      printf '%s\n' "${col_pname}== The module sources are located at: ${ZI_HOME}/${MOD_HOME} ==${col_rst}"
-      if test -f Makefile; then
-        if [ "$1" = "--clean" ]; then
-          printf '%s\n' "${col_info2}-- make distclean --${col_rst}"
-          make -s distclean
-          true
-        else
-          printf '%s\n' "${col_info2}-- make clean (pass --clean to invoke \`make distclean') --${col_rst}"
-          make -s clean
-        fi
-      fi
-      printf '%s\n' "${col_info2}-- Configuring --${col_rst}"
-      if CPPFLAGS=-I/usr/local/include CFLAGS="-g -Wall -O3" LDFLAGS=-L/usr/local/lib ./configure --disable-gdbm --without-tcsetpgrp; then
-        printf '%s\n' "${col_info2}-- Running make --${col_rst}"
-        if make -s; then
-          command cat <<-EOF
-▓▒░ Module has been built correctly.
-▓▒░ To load the module, add following 2 lines to .zshrc, at top:
-  module_path+=( "${ZI_HOME}/${MOD_HOME}/Src" )
-  zmodload zi/zpmod
-▓▒░ See 'zpmod -h' for more information.
-▓▒░ Run 'zpmod source-study' to see profile data,
-▓▒░ Guaranteed, automatic compilation of any sourced script.
-EOF
-        else
-          printf '%s\n' "${col_error}Module didn't build.${col_rst}. You can copy the error messages and submit"
-          printf '%s\n' "error-report at: https://github.com/z-shell/zpmod/issues"
-        fi
-      fi
+      printf '%s\n' "-- ERROR -- curl or wget is required to download install_zpmod.sh" >&2
+      exit 1
     fi
-  else
-    printf '%s\n' "${col_error} Zsh is not installed. Please install zsh and try again.${col_rst}"
+    if [ ! -s "${_zpmod_sh}" ]; then
+      printf '%s\n' "-- ERROR -- failed to download install_zpmod.sh" >&2
+      exit 1
+    fi
+    command chmod a+x "${_zpmod_sh}"
   fi
-}
 
-ZPMOD_PROFILE() {
-  col_pname=""
-  col_error=""
-  col_info=""
-  col_info2=""
-  col_rst=""
-
-  ZI_HOME="${ZI_HOME:-${ZDOTDIR:-${HOME}}/.zi}"
-  MOD_HOME="${MOD_HOME:-zmodules}/zpmod"
-
-  printf '%s\n' "${col_info}Re-run this script to update (from Github) and rebuild the module.${col_rst}"
-  printf '%s\n' "${col_info2}Press any key to continue, or Ctrl-C to exit.${col_rst}"
-  read -r
-
-  SETUP_ZPMOD
-  BUILD_ZPMOD "$@"
+  exec sh "${_zpmod_sh}" "$@"
 }
 
 CLOSE_PROFILE() {
@@ -273,6 +227,4 @@ EOF
   exit 0
 }
 
-while true; do
-  MAIN "${@}"
-done
+MAIN "${@}"

lib/sh/install_zpmod.sh

@@ -1,34 +1,56 @@
 #!/usr/bin/env sh
+# -*- mode: sh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=sh sw=2 ts=2 et
+
+set -eu
+
+WORKDIR="$(mktemp -d)" || exit 1
+trap 'rm -rf "${WORKDIR:?}"' EXIT INT TERM
+
+# Returns 0 if version $1 >= version $2 (dot-separated integers)
+_zi_ver_ge() {
+  _vga="$1" _vgb="$2"
+  while [ -n "${_vga}${_vgb}" ]; do
+    _af="${_vga%%.*}" _bf="${_vgb%%.*}"
+    case "${_vga}" in *.*) _vga="${_vga#*.}" ;; *) _vga="" ;; esac
+    case "${_vgb}" in *.*) _vgb="${_vgb#*.}" ;; *) _vgb="" ;; esac
+    _af="${_af:-0}" _bf="${_bf:-0}"
+    if [ "${_af}" -gt "${_bf}" ]; then return 0; fi
+    if [ "${_af}" -lt "${_bf}" ]; then return 1; fi
+  done
+  return 0
+}
 
 setup_environment() {
-  if [ -z "${ZI_HOME}" ]; then
-    if [ -d "${HOME}"/.zi ]; then
+  if [ -z "${ZI_HOME-}" ]; then
+    _xdg_zi="${XDG_DATA_HOME:-${HOME}/.local/share}/zi"
+    if [ -d "${_xdg_zi}" ]; then
+      ZI_HOME="${_xdg_zi}"
+    elif [ -d "${HOME}/.zi" ]; then
       ZI_HOME="${HOME}/.zi"
-    elif [ -d "${ZDOTDIR}"/.zi ]; then
+    elif [ -n "${ZDOTDIR-}" ] && [ -d "${ZDOTDIR}/.zi" ]; then
       ZI_HOME="${ZDOTDIR}/.zi"
-    elif [ -d "${XDG_DATA_HOME}"/.zi ]; then
-      ZI_HOME="${XDG_DATA_HOME}/.zi"
     else
-      ZI_HOME="${HOME}/.zi"
+      ZI_HOME="${_xdg_zi}"
     fi
   fi
-  if [ -z "${MOD_HOME}" ]; then
+  if [ -z "${MOD_HOME-}" ]; then
     MOD_HOME="${ZI_HOME}/zmodules/zpmod"
   fi
   if ! test -d "${MOD_HOME}"; then
     mkdir -p "${MOD_HOME}"
-    chmod g-rwX "${MOD_HOME}"
+    chmod go-w "${MOD_HOME}"
   fi
   if [ ! -d "${MOD_HOME}" ]; then
     printf '%s\n' "${col_error}== Error: Failed to setup module directory ==${col_rst}"
-    exit 255
+    exit 1
   fi
 }
 
 setup_zpmod_repository() {
   printf '%s\n' "${col_pname}== Downloading ZPMOD module to ${MOD_HOME}"
   if test -d "${MOD_HOME}/.git"; then
-    cd "${MOD_HOME}" || exit 255
+    cd "${MOD_HOME}" || exit 1
     git pull -q origin main
   else
     git clone --depth 10 -q https://github.com/z-shell/zpmod.git "${MOD_HOME}"
@@ -39,18 +61,19 @@ build_zpmod_module() {
   if command -v zsh >/dev/null; then
     printf '%s\n' "${col_info2}-- Checking version --${col_rst}"
     ZSH_CURRENT=$(zsh --version </dev/null | head -n1 | cut -d" " -f2,6- | tr -d '-')
-    ZSH_REQUIRED="5.8"
-    if expr "${ZSH_CURRENT}" \< "${ZSH_REQUIRED}" >/dev/null; then
-      printf '%s\n' "${col_error}-- Zsh version 5.8.1 and above required --${col_rst}"
+    ZSH_REQUIRED="5.8.1"
+    # shellcheck disable=SC2310
+    if ! _zi_ver_ge "${ZSH_CURRENT}" "${ZSH_REQUIRED}"; then
+      printf '%s\n' "${col_error}-- Zsh version ${ZSH_REQUIRED} and above required --${col_rst}"
       exit 1
     else
       (
         printf '%s\n' "${col_info2}-- Zsh version ${ZSH_CURRENT} --${col_rst}"
-        cd "${MOD_HOME}" || exit 255
+        cd "${MOD_HOME}" || exit 1
         printf '%s\n' "${col_pname}== Building module ZPMOD, running: a make clean, then ./configure and then make ==${col_rst}"
         printf '%s\n' "${col_pname}== The module sources are located at: ${MOD_HOME} ==${col_rst}"
         if test -f Makefile; then
-          if [ "$1" = "--clean" ]; then
+          if [ "${1-}" = "--clean" ]; then
             printf '%s\n' "${col_info2}-- make distclean --${col_rst}"
             make distclean
             true
@@ -62,9 +85,10 @@ build_zpmod_module() {
 
         INSTALL_PATH="/usr/local"
         export PATH="${INSTALL_PATH}"/bin:"${PATH}"
-        export LD_LIBRARY_PATH="${INSTALL_PATH}"/lib:"${LD_LIBRARY_PATH}"
-        export CFLAGS=-I"${INSTALL_PATH}"/include
-        export CPPFLAGS="-I${INSTALL_PATH}/include" LDFLAGS="-L${INSTALL_PATH}/lib"
+        export LD_LIBRARY_PATH="${INSTALL_PATH}/lib:${LD_LIBRARY_PATH-}"
+        export CFLAGS="-I${INSTALL_PATH}/include"
+        export CPPFLAGS="-I${INSTALL_PATH}/include"
+        export LDFLAGS="-L${INSTALL_PATH}/lib"
         CFLAGS="-g -Wall -O3" ./configure --disable-gdbm --without-tcsetpgrp --quiet
 
         printf '%s\n' "${col_info2}-- Running make --${col_rst}"
@@ -84,13 +108,13 @@ EOF
         else
           printf '%s\n' "${col_error}Module didn't build.${col_rst}. You can copy the error messages and submit"
           printf '%s\n' "error-report at: https://github.com/z-shell/zpmod/issues"
-          exit 255
+          exit 1
         fi
       )
     fi
   else
     printf '%s\n' "${col_error} Zsh is not installed. Please install zsh and try again.${col_rst}"
-    exit 255
+    exit 1
   fi
 }
 
@@ -106,6 +130,4 @@ MAIN() {
   exit 0
 }
 
-while true; do
-  MAIN "${@}"
-done
+MAIN "${@}"