Fix deployment script to accept multiple [sc-136060] (#88)

* Accept multi worded org names
huntresslabs · Jul 11, 2024 · 43cfc76 · 43cfc76
1 parent d89d7c9
commit 43cfc76
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Addigy/InstallHuntress-macOS-Addigy.sh b/Addigy/InstallHuntress-macOS-Addigy.sh
@@ -204,13 +204,12 @@ if grep -Fq "$invalid_key" "$install_script"; then
    exit 1
 fi
 
-install_cmd="/bin/zsh $install_script -a $accountKey -o $organizationKey -v"
+logger "=============== Begin Installer Logs ==============="
 if [ "$install_system_extension" = true ]; then
-    install_cmd+=" --install_system_extension"
+    install_result="$(/bin/bash "$install_script" -a "$accountKey" -o "$organizationKey" -v --install_system_extension)"
+else
+    install_result="$(/bin/bash "$install_script" -a "$accountKey" -o "$organizationKey" -v)"
 fi
-install_result=$(eval "${install_cmd}")
-
-logger "=============== Begin Installer Logs ==============="
 
 if [ $? != "0" ]; then
     logger "Installer Error: $install_result"

diff --git a/Bash/InstallHuntress-macOS-bash.sh b/Bash/InstallHuntress-macOS-bash.sh
@@ -185,11 +185,11 @@ if grep -Fq "$invalid_key" "$install_script"; then
    exit 1
 fi
 
-install_cmd="/bin/zsh $install_script -a $accountKey -o $organizationKey -v"
 if [ "$install_system_extension" = true ]; then
-    install_cmd+=" --install_system_extension"
+    install_result="$(/bin/bash "$install_script" -a "$accountKey" -o "$organizationKey" -v --install_system_extension)"
+else
+    install_result="$(/bin/bash "$install_script" -a "$accountKey" -o "$organizationKey" -v)"
 fi
-install_result=$(eval "${install_cmd}")
 
 logger "=============== Begin Installer Logs ==============="