diff --git a/fragments/arguments.sh b/fragments/arguments.sh index c669ee1..d600180 100644 --- a/fragments/arguments.sh +++ b/fragments/arguments.sh @@ -3,7 +3,7 @@ autoload is-at-least installedOSversion=$(sw_vers -productVersion) 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 fi @@ -24,7 +24,7 @@ fi while [[ -n $1 ]]; do if [[ $1 =~ ".*\=.*" ]]; then # 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 else # assume it's a label diff --git a/fragments/functions.sh b/fragments/functions.sh index d2432d1..5f9f2c1 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -444,7 +444,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir printlog "notifying" displaynotification "$message" "No update for $name!" fi - cleanupAndExit 0 "No new version to install" WARN + cleanupAndExit 0 "No new version to install" REG else printlog "Using force to install anyway." fi @@ -486,7 +486,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir # remove existing application if [ -e "$targetDir/$appName" ]; then - printlog "Removing existing $targetDir/$appName" DEBUG + printlog "Removing existing $targetDir/$appName" WARN deleteAppOut=$(rm -Rfv "$targetDir/$appName" 2>&1) tempName="$targetDir/$appName" tempNameLength=$((${#tempName} + 10)) @@ -497,16 +497,21 @@ installAppWithPath() { # $1: path to app to install in $targetDir # copy app to /Applications printlog "Copy $appPath to $targetDir" - if ! ditto "$appPath" "$targetDir/$appName"; then - cleanupAndExit 7 "Error while copying" ERROR + copyAppOut=$(ditto -v "$appPath" "$targetDir/$appName" 2>&1) + copyAppStatus=$(echo $?) + deduplicatelogs "$copyAppOut" + printlog "Debugging enabled, App copy output was:\n$logoutput" DEBUG + if [[ $copyAppStatus -ne 0 ]] ; then + #if ! ditto "$appPath" "$targetDir/$appName"; then + cleanupAndExit 7 "Error while copying:\n$logoutput" ERROR fi # set ownership to current user if [[ "$currentUser" != "loginwindow" && $SYSTEMOWNER -ne 1 ]]; then - printlog "Changing owner to $currentUser" + printlog "Changing owner to $currentUser" WARN chown -R "$currentUser" "$targetDir/$appName" else - printlog "No user logged in or SYSTEMOWNER=1, setting owner to root:wheel" + printlog "No user logged in or SYSTEMOWNER=1, setting owner to root:wheel" WARN chown -R root:wheel "$targetDir/$appName" fi @@ -604,7 +609,7 @@ installFromPKG() { printlog "notifying" displaynotification "$message" "No update for $name!" fi - cleanupAndExit 0 "No new version to install" WARN + cleanupAndExit 0 "No new version to install" REQ else printlog "Using force to install anyway." fi @@ -814,7 +819,7 @@ finishing() { message="Installed $name, version $appversion" fi - printlog "$message" + printlog "$message" REQ if [[ $currentUser != "loginwindow" && ( $NOTIFY == "success" || $NOTIFY == "all" ) ]]; then printlog "notifying" diff --git a/fragments/main.sh b/fragments/main.sh index a508d52..84fb73d 100644 --- a/fragments/main.sh +++ b/fragments/main.sh @@ -150,7 +150,7 @@ if [[ -n $appNewVersion ]]; then printlog "notifying" displaynotification "$message" "No update for $name!" fi - cleanupAndExit 0 "No newer version." WARN + cleanupAndExit 0 "No newer version." REQ fi else 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 runUpdateTool; then finishing - cleanupAndExit 0 + cleanupAndExit 0 "updateTool has run" REQ elif [[ $type == "updateronly" ]];then - printlog "type is $type so we end here." - cleanupAndExit 0 + cleanupAndExit 0 "type is $type so we end here." REQ fi # otherwise continue else printlog "DEBUG mode 1 enabled, not running update tool" WARN @@ -275,4 +274,4 @@ esac finishing # all done! -cleanupAndExit 0 +cleanupAndExit 0 "All done!" REQ