fix: Make install scripts uniform in behavior (#1398)

Make install scripts uniform in behavior
observIQ · Dec 19, 2023 · c29f219 · c29f219
1 parent 1d95c36
commit c29f219
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/scripts/install/install_macos.sh b/scripts/install/install_macos.sh
@@ -272,6 +272,7 @@ check_prereqs()
 {
   banner "Checking Prerequisites"
   increase_indent
+  root_check
   os_check
   dependencies_check
   success "Prerequisite check complete!"
@@ -659,9 +660,7 @@ main()
   # (e.g. uninstall) can run
 
   observiq_banner
-
   check_prereqs
-  root_check  
 
   if [ $# -ge 1 ]; then
     while [ -n "$1" ]; do

diff --git a/scripts/install/install_unix.sh b/scripts/install/install_unix.sh
@@ -765,6 +765,13 @@ uninstall()
 
 main()
 {
+  # We do these checks before we process arguments, because
+  # some of these options bail early, and we'd like to be sure that those commands
+  # (e.g. uninstall) can run
+
+  observiq_banner
+  check_prereqs
+
   if [ $# -ge 1 ]; then
     while [ -n "$1" ]; do
       case "$1" in
@@ -809,8 +816,6 @@ main()
     done
   fi
 
-  observiq_banner
-  check_prereqs
   connection_check
   setup_installation
   install_package