From 97e691c321913fbef5549c7f3dc7782a2cac24d4 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 11 Apr 2022 11:43:13 -0400
Subject: [PATCH] Sending things to the screen

---
 setup/so-functions | 4 +++-
 so-analyst-install | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 1710069e7..bdf206235 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -149,7 +149,9 @@ analyst_salt_local() {
 	logCmd "yum -y update --exclude=salt*"
 	logCmd "systemctl enable salt-minion"
 
-	logCmd "salt-call state.apply workstation --local --file-root=../salt/ -l info"
+	salt-call state.apply workstation --local --file-root=$(dirname "$0")/salt/ -l info 2>&1 | tee -a outfile
+	echo "Whiptail to reboot here"
+	exit 0 
 
 }
 
diff --git a/so-analyst-install b/so-analyst-install
index 50417c23d..c78756c98 100755
--- a/so-analyst-install
+++ b/so-analyst-install
@@ -15,6 +15,6 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-cd "$(dirname "$0")/salt/common/tools/sbin" || exit 255
+cd "$(dirname "$0")/setup" || exit 255
 
-./so-analyst-install
+./so-setup network "$@"