From bbeba0f6c7e39296aaca95c1226459ad1608b8bd Mon Sep 17 00:00:00 2001
From: Uttie Gumbula <106617400+uttie-huntress@users.noreply.github.com>
Date: Wed, 17 Jul 2024 19:13:41 -0700
Subject: [PATCH] update other macos deployment scripts (#90)

* update other macos deployment scripts
---
 Atera/InstallHuntress-macOS-Atera.sh                 | 12 ++++++++----
 .../InstallHuntress-macOS-nable.sh                   |  9 ++++-----
 Ninja-RMM/InstallHuntress-macOS-NinjaRMM.sh          |  9 ++++-----
 Syncro/InstallHuntress-macOS-Syncro.sh               |  9 ++++-----
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Atera/InstallHuntress-macOS-Atera.sh b/Atera/InstallHuntress-macOS-Atera.sh
index b452da6..efdeff0 100644
--- 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
index 614ab0e..a65cd9c 100644
--- 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
index 810c3fb..e32124c 100644
--- 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
index 407cbb0..aa3d614 100644
--- 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"