Undo over-engineering (or try to anyway)

libexec/sourcezap/commands/sourcezap-checkout

@@ -5,7 +5,7 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repodir=$1
 branch=$2
 
@@ -21,7 +21,7 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
+if ! "${libexec}"/scripts/is-sourcezap-member; then
     printerr "$(id -un) is not a member of _sourcezap"
     exit 1
 fi

libexec/sourcezap/commands/sourcezap-clone

@@ -5,7 +5,7 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repourl=$1
 repodir=$2
 branch=$3
@@ -22,7 +22,7 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
+if ! "${libexec}"/scripts/is-sourcezap-member; then
     printerr "$(id -un) is not a member of _sourcezap"
     exit 1
 fi

libexec/sourcezap/commands/sourcezap-install

@@ -5,8 +5,8 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
-mask=$("${libexec}"/utils/get-umask)
+mask=$("${libexec}"/scripts/get-default-umask)
 repodir=$1
 installdir=$2
 commitfile=$3
@@ -28,14 +28,14 @@ if [ -e "${commitfile}" ]; then
     ##
     # install update
     commit=$(cat "${commitfile}")
-    "${libexec}"/utils/install/run -d "${installdir}"
+    "${libexec}"/scripts/install -d "${installdir}"
-    "${libexec}"/utils/install/update-deleted-files "${repodir}" "${installdir}" "${commit}"
+    "${libexec}"/scripts/update-deleted-files "${repodir}" "${installdir}" "${commit}"
-    "${libexec}"/utils/install/update-changed-files "${repodir}" "${installdir}" "${commit}"
+    "${libexec}"/scripts/update-changed-files "${repodir}" "${installdir}" "${commit}"
 else
     ##
     # install from scratch
     umask "${mask}"
-    "${libexec}"/utils/install/run -d "${installdir}"
+    "${libexec}"/scripts/install -d "${installdir}"
     find -s . \
          -maxdepth 1 \
          ! -name "." \

libexec/sourcezap/commands/sourcezap-pull

@@ -5,7 +5,7 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repodir=$1
 
 ##
@@ -20,7 +20,7 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
+if ! "${libexec}"/scripts/is-sourcezap-member; then
     printerr "$(id -un) is not a member of _sourcezap"
     exit 1
 fi

libexec/sourcezap/commands/sourcezap-setup

@@ -14,8 +14,8 @@ libexec="${localbase}"/libexec/sourcezap
 ##
 # main
 if [ "$(id -u)" = "0" ]; then
-    "${libexec}"/setup/setup-user
+    "${libexec}"/scripts/setup-user
-    "${libexec}"/setup/setup-doas
+    "${libexec}"/scripts/setup-doas
     printok "setup complete"
 else
     printerr "you must be root"

libexec/sourcezap/commands/sourcezap-sh

@@ -20,7 +20,7 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
+if ! "${libexec}"/scripts/is-sourcezap-member; then
    printerr "$(id -un) is not a member of _sourcezap"
    exit 1
 fi

libexec/sourcezap/scripts/git

@@ -3,10 +3,10 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
 git=$(which git)
-mask=$("${libexec}"/utils/get-umask)
+mask=$("${libexec}"/scripts/get-default-umask)
 
 ##
 # main

libexec/sourcezap/scripts/git-get-changed-files

@@ -3,9 +3,9 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repodir=$1
 commit=$2
 

libexec/sourcezap/scripts/git-get-removed-files

@@ -3,9 +3,9 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repodir=$1
 commit=$2
 

libexec/sourcezap/scripts/install

@@ -3,9 +3,9 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-mask=$("${libexec}"/utils/get-umask)
+mask=$("${libexec}"/scripts/get-default-umask)
 
 ##
 # main

libexec/sourcezap/scripts/setup-doas

@@ -16,7 +16,8 @@ sharedir="${localbase}"/share/sourcezap
 # main
 src="${sharedir}"/doas.conf
 dest="${localbase}"/etc/doas.conf
-while read -r line < "${src}"; do
+cat "${src}" |
+while read -r line; do
     if grep -q "${line}" "${dest}"; then
         continue
     fi

libexec/sourcezap/scripts/update-changed-files

@@ -3,7 +3,7 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
 repodir=$1
 installdir=$2
@@ -12,7 +12,7 @@ commit=$3
 ##
 # main
 cd "${repodir}"
-files=$("${libexec}"/utils/git/get-changed-files "${repodir}" "${commit}")
+files=$("${libexec}"/scripts/git-get-changed-files "${repodir}" "${commit}")
 for file in ${files}; do
     target="${installdir}/${file}"
     parent=$(dirname "${target}")
@@ -22,7 +22,7 @@ for file in ${files}; do
         parent=$(dirname "${parent}")
     done
     for dir in ${parents}; do
-        "${libexec}"/utils/install/run -d "${dir}"
+        "${libexec}"/scripts/install -d "${dir}"
     done
-    "${libexec}"/utils/install/run "${file}" "${target}"
+    "${libexec}"/scripts/install "${file}" "${target}"
 done

libexec/sourcezap/scripts/update-deleted-files

@@ -3,7 +3,7 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
 repodir=$1
 installdir=$2
@@ -12,7 +12,7 @@ commit=$3
 ##
 # main
 cd "${repodir}"
-files=$("${libexec}"/utils/git/get-removed-files "${repodir}" "${commit}")
+files=$("${libexec}"/scripts/git/get-removed-files "${repodir}" "${commit}")
 for file in ${files}; do
     target="${installdir}/${file}"
     parent=$(dirname "${target}")

share/sourcezap/CHANGELOG

@@ -1,5 +1,21 @@
 # -*- mode: org -*-
 
+* vNEXT
+
+**** Address ~libexec/sourcezap/scripts/setup-doas~ bug
+This change addresses a bug in ~setup-doas~ that could hang
+the ~sourcezap setup~ command
+
+**** Collapse ~libexec/sourcezap/scripts~
+This change does not try to organize script directories that
+go beyond ~libexec/sourcezap/scripts~
+
+**** Add ~libexec/sourcezap/scripts/setup~
+This new directory replaces what was formerly known as ~libexec/sourcezap/setup~
+
+**** Add ~libexec/sourcezap/scripts~
+This new directory replaces what was formerly known as ~libexec/sourcezap/utils~
+
 * v1.1.0
 
 **** Add 'libexec/sourcezap/utils/get-umask'