update other macos deployment scripts (#90)

* update other macos deployment scripts
huntresslabs · Jul 18, 2024 · bbeba0f · bbeba0f
1 parent 43cfc76
commit bbeba0f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/Atera/InstallHuntress-macOS-Atera.sh b/Atera/InstallHuntress-macOS-Atera.sh
@@ -183,13 +183,17 @@ 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"
+    exit 1
+fi
 
 if [ $? != "0" ]; then
     logger "Installer Error: $install_result"

diff --git a/N-able (SolarWinds) N-central/InstallHuntress-macOS-nable.sh b/N-able (SolarWinds) N-central/InstallHuntress-macOS-nable.sh
@@ -185,13 +185,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/Ninja-RMM/InstallHuntress-macOS-NinjaRMM.sh b/Ninja-RMM/InstallHuntress-macOS-NinjaRMM.sh
@@ -185,13 +185,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/Syncro/InstallHuntress-macOS-Syncro.sh b/Syncro/InstallHuntress-macOS-Syncro.sh
@@ -186,13 +186,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"