MacOS fixes

Scripts/base.sh

@@ -297,6 +297,10 @@ touch "$REPO_ROOT/Zsh/.zsh_secrets"
 TARGET_SHELL="$(command -v zsh)"
 CURRENT_LOGIN_SHELL=""
 
+if is_macos && [ -x /bin/zsh ]; then
+    TARGET_SHELL="/bin/zsh"
+fi
+
 if command -v getent >/dev/null 2>&1; then
     CURRENT_LOGIN_SHELL="$(getent passwd "$(whoami)" | cut -d: -f7)"
 elif is_macos && command -v dscl >/dev/null 2>&1; then