From 2a15a2142d15982bb70f437328c702d99380e39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 23 Nov 2021 08:59:44 +0100 Subject: [PATCH] Moved root check to before case statement We can have code in the case statement, so no need to run that, if we were supposed to exit. --- fragments/arguments.sh | 5 +++++ fragments/main.sh | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fragments/arguments.sh b/fragments/arguments.sh index 4fca81e..0ce33a2 100644 --- a/fragments/arguments.sh +++ b/fragments/arguments.sh @@ -46,6 +46,11 @@ versionKey="CFBundleShortVersionString" # get current user currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }') +# MARK: check for root +if [[ "$(whoami)" != "root" && "$DEBUG" -ne 2 ]]; then + # not running as root + cleanupAndExit 6 "not running as root, exiting" +fi # MARK: labels in case statement case $label in diff --git a/fragments/main.sh b/fragments/main.sh index 79e5685..51f9c9f 100644 --- a/fragments/main.sh +++ b/fragments/main.sh @@ -5,11 +5,6 @@ ;; 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