v4.3.1

=====================================================================

- MacOS does some weird stuff with the homebrew prefix apparently

.circleci/config.yml

@@ -102,6 +102,7 @@ jobs:
             && echo "source=(scwrypts.tar.gz)" >> PKGBUILD
             && echo "sha256sums=(SKIP)" >> PKGBUILD
             && makepkg --noconfirm -si
+            && echo validating scwrypts version
             && scwrypts --version | grep "^scwrypts v$PKGVER$"
             ;
 

scwrypts

@@ -84,7 +84,7 @@ source "$(dirname $(readlink -f "$0"))/zsh/lib/import.driver.zsh" || exit 42
 			--version )
 				case $SCWRYPTS_INSTALLATION_TYPE in
 					manual ) echo "scwrypts $(GIT_SCWRYPTS describe --tags) (via GIT)" ;;
-					     * ) echo scwrypts $(cat "$SCWRYPTS_ROOT__scwrypts/VERSION")   ;;
+					     * ) echo "scwrypts $(cat "$SCWRYPTS_ROOT__scwrypts/VERSION")" ;;
 				esac
 				return 0
 				;;

zsh/lib/config.zsh

@@ -1,22 +1,27 @@
 [[ $__SCWRYPT -eq 1 ]] && return 0
 #####################################################################
 
-SCWRYPTS_ROOT="$(cd -- ${0:a:h}; git rev-parse --show-toplevel 2>/dev/null)"
+# Apparently MacOS puts ALL of the homebrew stuff inside of a top level git repository
+# with bizarre git ignores; so:
+#  - USE the git root if it's a manual install...
+#  - UNLESS that git root is just the $(brew --prefix)
+SCWRYPTS_ROOT="$(cd -- ${0:a:h}; git rev-parse --show-toplevel 2>/dev/null | grep -v "^$(brew --prefix 2>/dev/null)$")"
 
 [ $SCWRYPTS_ROOT ] && [ -d "$SCWRYPTS_ROOT" ] \
-	|| SCWRYPTS_ROOT="echo \"${0:a:h}\" | sed -n 's|\(share/scwrypts\).*$|\1|p'"
+	|| SCWRYPTS_ROOT="$(echo "${0:a:h}" | sed -n 's|\(share/scwrypts\).*$|\1|p')"
 
 [ $SCWRYPTS_ROOT ] && [ -d "$SCWRYPTS_ROOT" ] || {
 	echo "cannot determine scwrypts root path for current installation; aborting"
 	exit 1
 }
 
+export SCWRYPTS_ROOT__scwrypts="$SCWRYPTS_ROOT"
+
 [ -f "$SCWRYPTS_ROOT__scwrypts/MANAGED_BY" ] \
 	&& export SCWRYPTS_INSTALLATION_TYPE=$(cat "$SCWRYPTS_ROOT__scwrypts/MANAGED_BY") \
 	|| export SCWRYPTS_INSTALLATION_TYPE=manual \
 	;
 
-export SCWRYPTS_ROOT__scwrypts="$SCWRYPTS_ROOT"
 
 #####################################################################