Adopt remaining major portzap updates

Makefile

@@ -5,10 +5,11 @@ LIBEXECDIR = $(PREFIX)/libexec/sourcezap
 SHAREDIR = $(PREFIX)/share/sourcezap
 
 install:
-	install -d $(BINDIR) $(LIBEXECDIR) $(SHAREDIR) $(MANDIR)
+	install -d $(BINDIR) $(LIBEXECDIR) $(LIBEXECDIR)/commands $(LIBEXECDIR)/utils $(SHAREDIR) $(MANDIR)
 	install -m 0755 bin/sourcezap $(BINDIR)
 	install -m 0755 bin/setup-sourcezap $(BINDIR)
-	install -m 0755 libexec/sourcezap/* $(LIBEXECDIR)
+	install -m 0755 libexec/sourcezap/commands/* $(LIBEXECDIR)/commands
+	install -m 0755 libexec/sourcezap/utils/* $(LIBEXECDIR)/utils
 	install -m 0644 share/sourcezap/* $(SHAREDIR)
 	install -m 0644 man/man8/sourcezap.8 $(MANDIR)
 
@@ -20,5 +21,6 @@ deinstall:
 	rm -rf $(SHAREDIR)
 
 shellcheck:
-	shellcheck bin/sourcezap
+	shellcheck bin/*
-	shellcheck libexec/sourcezap/*
+	shellcheck libexec/sourcezap/utils/*
+	shellcheck libexec/sourcezap/commands/*

libexec/sourcezap/commands/sourcezap-checkout

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

libexec/sourcezap/commands/sourcezap-clone

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

libexec/sourcezap/commands/sourcezap-install

@@ -15,8 +15,8 @@ revfile=$3
 perform_update()
 {
     rev=$(cat "${revfile}")
-    add=$("${libexec}"/git-changed-files "${gitdir}" "${rev}")
+    add=$("${libexec}"/utils/git-changed-files "${gitdir}" "${rev}")
-    del=$("${libexec}"/git-removed-files "${gitdir}" "${rev}")
+    del=$("${libexec}"/utils/git-removed-files "${gitdir}" "${rev}")
     for file in ${del}; do
         target="${installdir}/${file}"
         parent=$(dirname "${target}")
@@ -64,6 +64,11 @@ run_install()
     install -o root -g _sourcezap -m "${mode}" -v "$@"
 }
 
+printok()
+{
+    "${libexec}"/utils/printok "${1}"
+}
+
 printerr()
 {
     "${libexec}"/utils/printerr "${1}"
@@ -79,7 +84,6 @@ fi
 set -x
 umask ${mode}
 cd "${gitdir}"
-set +x
 run_install "-d" "${installdir}"
 chmod ${mode} "${installdir}"
 if [ -e "${revfile}" ]; then
@@ -87,4 +91,6 @@ if [ -e "${revfile}" ]; then
 else
     perform_install
 fi
-"${libexec}"/git-rev "${gitdir}" > "${revfile}"
+"${libexec}"/utils/git-rev "${gitdir}" > "${revfile}"
+set +x
+printok "install complete"

libexec/sourcezap/commands/sourcezap-pull

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