Move root user check forward, add debug mode 2

Moved the root user check to the beginning of the script, but added in debug
mode 2 to allow for the kinds of testing you used to be able to do when running
the program in debug 0 as a non-root user.  Resolves issue 88

fragments/functions.sh

@@ -4,7 +4,7 @@ cleanupAndExit() { # $1 = exit code, $2 message
     if [[ -n $2 && $1 -ne 0 ]]; then
         printlog "ERROR: $2"
     fi
-    if [ "$DEBUG" -eq 0 ]; then
+    if [ "$DEBUG" -ne 1 ]; then
         # remove the temporary working directory when done
         printlog "Deleting $tmpDir"
         rm -Rf "$tmpDir"
@@ -192,9 +192,9 @@ getAppVersion() {
 }
 
 checkRunningProcesses() {
-    # don't check in DEBUG mode
+    # don't check in DEBUG mode 1
-    if [[ $DEBUG -ne 0 ]]; then
+    if [[ $DEBUG -eq 1 ]]; then
-        printlog "DEBUG mode, not checking for blocking processes"
+        printlog "DEBUG mode 1, not checking for blocking processes"
         return
     fi
 
@@ -299,9 +299,9 @@ reopenClosedProcess() {
         return
     fi
 
-    # don't reopen in DEBUG mode
+    # don't reopen in DEBUG mode 1
-    if [[ $DEBUG -ne 0 ]]; then
+    if [[ $DEBUG -eq 1 ]]; then
-        printlog "DEBUG mode, not reopening anything"
+        printlog "DEBUG mode 1, not reopening anything"
         return
     fi
     
@@ -358,16 +358,16 @@ installAppWithPath() { # $1: path to app to install in $targetDir
         printlog "Downloaded version of $name is $appNewVersion (replacing version $appversion)."
     fi
 
-    # skip install for DEBUG
+    # skip install for DEBUG 1
-    if [ "$DEBUG" -ne 0 ]; then
+    if [ "$DEBUG" -eq 1 ]; then
-        printlog "DEBUG enabled, skipping remove, copy and chown steps"
+        printlog "DEBUG mode 1 enabled, skipping remove, copy and chown steps"
         return 0
     fi
 
-    # check for root
+    # skip install for DEBUG 2
-    if [ "$(whoami)" != "root" ]; then
+    if [ "$DEBUG" -eq 2 ]; then
-        # not running as root
+        printlog "DEBUG mode 2 enabled, exiting"
-        cleanupAndExit 6 "not running as root, exiting"
+        cleanupAndExit 0
     fi
 
     # remove existing application
@@ -462,16 +462,16 @@ installFromPKG() {
         fi
     fi
     
-    # skip install for DEBUG
+    # skip install for DEBUG 1
-    if [ "$DEBUG" -ne 0 ]; then
+    if [ "$DEBUG" -eq 1 ]; then
         printlog "DEBUG enabled, skipping installation"
         return 0
     fi
 
-    # check for root
+    # skip install for DEBUG 2
-    if [ "$(whoami)" != "root" ]; then
+    if [ "$DEBUG" -eq 2 ]; then
-        # not running as root
+        printlog "DEBUG mode 2 enabled, exiting"
-        cleanupAndExit 6 "not running as root, exiting"
+        cleanupAndExit 0 
     fi
 
     # install pkg

fragments/header.sh

@@ -20,9 +20,11 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 # NOTE: adjust these variables:
 
-# set to 0 for production, 1 for debugging
+# set to 0 for production, 1 or 2 for debugging
 # while debugging, items will be downloaded to the parent directory of this script
 # also no actual installation will be performed
+# debug mode 1 will download to the directory the script is run in, but will not check version 
+# debug mode 2 will download to the temp directory, check for blocking processes, check version, but will not install anything or remove the current version
 DEBUG=1
 
 # notify behavior

fragments/main.sh

@@ -5,6 +5,11 @@
     ;;
 esac
 
+# MARK: check for root
+if [[ "$(whoami)" != "root" && "$DEBUG" -ne 2 ]]; then
+    # not running as root
+    cleanupAndExit 6 "not running as root, exiting"
+fi
 
 # MARK: application download and installation starts here
 
@@ -96,7 +101,7 @@ if [[ -z $blockingProcesses ]]; then
 fi
 
 # MARK: determine tmp dir
-if [ "$DEBUG" -ne 0 ]; then
+if [ "$DEBUG" -eq 1 ]; then
     # for debugging use script dir as working directory
     tmpDir=$(dirname "$0")
 else
@@ -120,7 +125,7 @@ printlog "appversion: $appversion"
 if [[ -n $appNewVersion ]]; then
     printlog "Latest version of $name is $appNewVersion"
     if [[ $appversion == $appNewVersion ]]; then
-        if [[ $DEBUG -eq 0 ]]; then
+        if [[ $DEBUG -ne 1 ]]; then
             printlog "There is no newer version available."
             if [[ $INSTALL != "force" ]]; then
                 message="$name, version $appNewVersion, is  the latest version."
@@ -134,7 +139,7 @@ if [[ -n $appNewVersion ]]; then
                 updateTool=""
             fi
         else
-            printlog "DEBUG mode enabled, not exiting, but there is no new version of app."
+            printlog "DEBUG mode 1 enabled, not exiting, but there is no new version of app."
         fi
     fi
 else
@@ -148,7 +153,7 @@ fi
 # MARK: check if this is an Update and we can use updateTool
 if [[ (-n $appversion && -n "$updateTool") || "$type" == "updateronly" ]]; then
     printlog "appversion & updateTool"
-    if [[ $DEBUG -eq 0 ]]; then
+    if [[ $DEBUG -ne 1 ]]; then
         if runUpdateTool; then
             finishing
             cleanupAndExit 0
@@ -157,13 +162,13 @@ if [[ (-n $appversion && -n "$updateTool") || "$type" == "updateronly" ]]; then
             cleanupAndExit 0
         fi # otherwise continue
     else
-        printlog "DEBUG mode enabled, not running update tool"
+        printlog "DEBUG mode 1 enabled, not running update tool"
     fi
 fi
 
 # MARK: download the archive
-if [ -f "$archiveName" ] && [ "$DEBUG" -ne 0 ]; then
+if [ -f "$archiveName" ] && [ "$DEBUG" -eq 1 ]; then
-    printlog "$archiveName exists and DEBUG enabled, skipping download"
+    printlog "$archiveName exists and DEBUG mode 1 enabled, skipping download"
 else
     # download the dmg
     printlog "Downloading $downloadURL to $archiveName"