mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-08 05:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Few logging levels changed

Browse Source 
I want to return a valid explanation for log level REQ for why the script stops.
This commit is contained in:
Søren Theilgaard
2022-02-21 16:47:57 +01:00
parent a3dbf75818
commit 9fd2b87e3c
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fragments/arguments.sh
View File

@@ -3,7 +3,7 @@ autoload is-at-least
installedOSversion=$(sw_vers -productVersion) installedOSversion=$(sw_vers -productVersion)
if ! is-at-least 10.14 $installedOSversion; then if ! is-at-least 10.14 $installedOSversion; then
printlog "Installomator requires at least macOS 10.14 Mojave." printlog "Installomator requires at least macOS 10.14 Mojave." ERROR
exit 98 exit 98
fi fi
@@ -24,7 +24,7 @@ fi
while [[ -n $1 ]]; do while [[ -n $1 ]]; do
if [[ $1 =~ ".*\=.*" ]]; then if [[ $1 =~ ".*\=.*" ]]; then
# if an argument contains an = character, send it to eval # if an argument contains an = character, send it to eval
printlog "setting variable from argument $1" REQ printlog "setting variable from argument $1" WARN
eval $1 eval $1
else else
# assume it's a label # assume it's a label

6
fragments/functions.sh
View File

@@ -444,7 +444,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
printlog "notifying" printlog "notifying"
displaynotification "$message" "No update for $name!" displaynotification "$message" "No update for $name!"
fi fi
cleanupAndExit 0 "No new version to install" WARN cleanupAndExit 0 "No new version to install" REG
else else
printlog "Using force to install anyway." printlog "Using force to install anyway."
fi fi
@@ -604,7 +604,7 @@ installFromPKG() {
printlog "notifying" printlog "notifying"
displaynotification "$message" "No update for $name!" displaynotification "$message" "No update for $name!"
fi fi
cleanupAndExit 0 "No new version to install" WARN cleanupAndExit 0 "No new version to install" REQ
else else
printlog "Using force to install anyway." printlog "Using force to install anyway."
fi fi
@@ -814,7 +814,7 @@ finishing() {
message="Installed $name, version $appversion" message="Installed $name, version $appversion"
fi fi
printlog "$message" printlog "$message" REQ
if [[ $currentUser != "loginwindow" && ( $NOTIFY == "success" || $NOTIFY == "all" ) ]]; then if [[ $currentUser != "loginwindow" && ( $NOTIFY == "success" || $NOTIFY == "all" ) ]]; then
printlog "notifying" printlog "notifying"

9
fragments/main.sh
View File

@@ -150,7 +150,7 @@ if [[ -n $appNewVersion ]]; then
printlog "notifying" printlog "notifying"
displaynotification "$message" "No update for $name!" displaynotification "$message" "No update for $name!"
fi fi
cleanupAndExit 0 "No newer version." WARN cleanupAndExit 0 "No newer version." REQ
fi fi
else else
printlog "DEBUG mode 1 enabled, not exiting, but there is no new version of app." WARN printlog "DEBUG mode 1 enabled, not exiting, but there is no new version of app." WARN
@@ -166,10 +166,9 @@ if [[ (-n $appversion && -n "$updateTool") || "$type" == "updateronly" ]]; then
if [[ $DEBUG -ne 1 ]]; then if [[ $DEBUG -ne 1 ]]; then
if runUpdateTool; then if runUpdateTool; then
finishing finishing
cleanupAndExit 0 cleanupAndExit 0 "updateTool has run" REQ
elif [[ $type == "updateronly" ]];then elif [[ $type == "updateronly" ]];then
printlog "type is $type so we end here." cleanupAndExit 0 "type is $type so we end here." REQ
cleanupAndExit 0
fi # otherwise continue fi # otherwise continue
else else
printlog "DEBUG mode 1 enabled, not running update tool" WARN printlog "DEBUG mode 1 enabled, not running update tool" WARN
@@ -275,4 +274,4 @@ esac
finishing finishing
# all done! # all done!
cleanupAndExit 0 cleanupAndExit 0 "All done!" REQ