Call issourcezap-member before ${gitdir} check

README.md

@@ -1,10 +1,10 @@
 ## About
 
-sourcezap manages a local copy of the
+sourcezap is a utility that manages a local copy of the
 [HardenedBSD source tree](https://git.HardenedBSD.org/HardenedBSD/HardenedBSD).
 The copy of the source tree is maintained by members of
-the `_sourcezap` group, and a copy of the source tree
+the `_sourcezap` group, and the copy of the source tree
-can be installed into `/usr/src/` by root.
+can be installed into `/usr/ports/` by root.
 
 ## CLI
 

libexec/sourcezap/commands/sourcezap-checkout

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

libexec/sourcezap/commands/sourcezap-clone

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

libexec/sourcezap/commands/sourcezap-pull

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

libexec/sourcezap/commands/sourcezap-sh

@@ -20,15 +20,16 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
+if ! "${libexec}"/utils/issourcezap-member; then
+   printerr "$(id -un) is not a member of _sourcezap"
+   exit 1
+fi
+
 if [ ! -e "${gitdir}" ]; then
     printerr "try 'sourcezap clone' instead"
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
-   printerr "$(id -un) is not a member of _sourcezap"
-fi
-
 cd "${gitdir}"
 doas -n \
      -u "${user}" \

libexec/sourcezap/utils/issourcezap-member

@@ -5,5 +5,5 @@ set -e
 # main
 group="_sourcezap"
 mygroups=$(id -Gn | tr ' ' '\n')
-echo "${mygroups}" | grep -e "^${group}$"
+echo "${mygroups}" | grep -e "^${group}$" > /dev/null 2>&1
 exit "${?}"