From a36e9fce43b8f09d076264b11cd0b9b4e9744163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Wed, 12 Jan 2022 13:53:48 +0100
Subject: [PATCH 1/9] Isaac Logging

Improvements to logging:
- Logging levels as DEBUG 0 INFO 1 WARN 2 ERROR 3 REQ 4
- External logging to Datadog
- A function to shorten duplicate lines in installation logs
- Ability to extract install.log in the time when Installomator was running, if further investigations needs to be done to logs
---
 CHANGELOG.md           |  6 +++
 fragments/functions.sh | 99 +++++++++++++++++++++++++++++++++++++++---
 fragments/header.sh    | 37 ++++++++++++++++
 3 files changed, 137 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dd2a79..c2843dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@
 - Changed logic if `IGNORE_APP_STORE_APPS=yes`. Before this version a label like `microsoftonedrive` that was installed from App Store, and that we want to replace with the “ordinary” version, Installomator would still use `updateTool`, even though `IGNORE_APP_STORE_APPS=yes`. So we would have to have `INSTALL=force` in order to have the app replaced, as `updateTool` would be used. But now if `IGNORE_APP_STORE_APPS=yes` then `updateTool` will be not set, and the App Store app will be replaced. BUT if the installed software was not from App Store, then `updateTool` will not be used, and it would be a kind of a forced install (in the example of `microsoftonedrive`), except if the version is the same (where installation is skipped).
 - Added variable `SYSTEMOWNER` that is used when copying files when installing. Default `0` is to change owner of the app to the current user on the Mac, like this user was installing this app themselves. When using `1` we will put “root:wheel” on the app, which can be useful for shared machines.
 
+Big changes to logging:
+- Logging levels as DEBUG 0 INFO 1 WARN 2 ERROR 3 REQ 4
+- External logging to Datadog
+- A function to shorten duplicate lines in installation logs
+- Ability to extract install.log in the time when Installomator was running, if further investigations needs to be done to logs
+
 ## v8.0
 
 - removed leading `0` from the version because it has lost all meaning (thanks to @grahampugh for the inspiration)
diff --git a/fragments/functions.sh b/fragments/functions.sh
index 0908662..dd20375 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -67,15 +67,104 @@ displaynotification() { # $1: message $2: title
 # MARK: Logging
 log_location="/private/var/log/Installomator.log"
 
-printlog(){
+# Check if we're in debug mode, if so then set logging to DEBUG, otherwise default to INFO
+# if no log level is specified.
+if [[ $DEBUG -ne 0 ]]; then
+    LOGGING=DEBUG
+elif [[ -z $LOGGING ]]; then
+    LOGGING=INFO
+    datadogLoggingLevel=INFO
+fi
 
+# Associate logging levels with a numerical value so that we are able to identify what
+# should be removed. For example if the LOGGING=ERROR only printlog statements with the
+# level REQ and ERROR will be displayed. LOGGING=DEBUG will show all printlog statements.
+# If a printlog statement has no level set it's automatically assigned INFO.
+
+declare -A levels=(DEBUG 0 INFO 1 WARN 2 ERROR 3 REQ 4)
+
+# If we are able to detect an MDM URL (Jamf Pro) or another identifier for a customer/instance we grab it here, this is useful if we're centrally logging multiple MDM instances.
+if [[ -f /Library/Preferences/com.jamfsoftware.jamf.plist ]]; then
+    mdmURL=$(defaults read /Library/Preferences/com.jamfsoftware.jamf.plist jss_url)
+elif [[ -n "$MDMProfileName" ]]; then
+    mdmURL=$(sudo profiles show | grep -A3 "$MDMProfileName" | sed -n -e 's/^.*organization: //p')
+else
+    mdmURL="Unknown"
+fi
+
+# Generate a session key for this run, this is useful to idenify streams when we're centrally logging.
+SESSION=$RANDOM
+
+printlog(){
+    [ -z "$2" ] && 2=INFO
+    log_message=$1
+    log_priority=$2
     timestamp=$(date +%F\ %T)
 
-    if [[ "$(whoami)" == "root" ]]; then
-        echo "$timestamp" "$label" "$1" | tee -a $log_location
-    else
-        echo "$timestamp" "$label" "$1"
+    # Check to make sure that the log isn't the same as the last, if it is then don't log and increment a timer.
+    if [[ ${log_message} == ${previous_log_message} ]];then
+        let logrepeat=$logrepeat+1
+        return
     fi
+
+    previous_log_message=$log_message
+
+    # Once we finally stop getting duplicate logs output the number of times we got a duplicate.
+    if [[ $logrepeat -gt 1 ]];then
+        echo "$timestamp" : "${log_priority} : ${VERSIONDATE//-/} : Last Log repeated ${logrepeat} times" | tee -a $log_location
+
+    if [[ ! -z $datadogAPI ]]; then
+        curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : $APPLICATION : $VERSIONDATE : $SESSION : Last Log repeated ${logrepeat} times" > /dev/null
+    fi
+    logrepeat=0
+
+    # If the datadogAPI key value is set and our logging level is greaterthan or equal to our set level
+    # then post to Datadog's HTTPs endpoint.
+    if [[ -n $datadogAPI && ${levels[$log_priority]} -ge ${levels[$datadogLoggingLevel]} ]]; then
+        while IFS= read -r logmessage; do
+            curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : Installomator-${label} : ${VERSIONDATE//-/} : $SESSION : ${logmessage}" > /dev/null
+        done <<< "$log_message"
+    fi
+
+    # If our logging level is greaterthan or equal to our set level then output locally.
+    if [[ ${levels[$log_priority]} -ge ${levels[$LOGGING]} ]]; then
+        while IFS= read -r logmessage; do
+            if [[ "$(whoami)" == "root" ]]; then
+                echo "$timestamp" : "${log_priority} : ${VERSIONDATE//-/} : ${logmessage}" | tee -a $log_location
+            else
+                echo "$timestamp" : "${log_priority} : ${VERSIONDATE//-/} : ${logmessage}"
+            fi
+        done <<< "$log_message"
+    fi
+
+#    if [[ "$(whoami)" == "root" ]]; then
+#        echo "$timestamp" "$label" "$1" | tee -a $log_location
+#    else
+#        echo "$timestamp" "$label" "$1"
+#    fi
+}
+
+# Used to remove dupplicate lines in large log output, for example from msupdate command
+# after it finishes running.
+deduplicatelogs() {
+    loginput=${1:-"Log"}
+    logoutput=""
+    # Read each line of the incoming log individually, match it with the previous.
+    # If it matches increment logrepeate then skip to the next line.
+    while read log; do
+        if [[ $log == $previous_log ]];then
+            let logrepeat=$logrepeat+1
+            continue
+        fi
+
+        previous_log="$log"
+        if [[ $logrepeat -gt 1 ]];then
+            logoutput+="Last Log repeated ${logrepeat} times\n"
+            logrepeat=0
+        fi
+
+        logoutput+="$log\n"
+    done <<< "$loginput"
 }
 
 # will get the latest release download from a github repo
diff --git a/fragments/header.sh b/fragments/header.sh
index 36f8500..27bc57f 100644
--- a/fragments/header.sh
+++ b/fragments/header.sh
@@ -239,3 +239,40 @@ REOPEN="yes"
 #   installer that should be located after mounting/expanding the downloaded archive.
 #   See label adobecreativeclouddesktop
 #
+### Logging
+# Logging behavior
+LOGGING=""
+# options:
+#   - DEBUG     Everything is logged
+#   - INFO      (default) normal logging level
+#   - WARN      only warning
+#   - ERROR     only errors
+#   - REQ       ????
+
+# MDM profile name
+MDMProfileName=""
+# options:
+#   - MDM Profile               Addigy has this name on the profile
+#   - Mosyle Corporation MDM    Mosyle uses this name on the profile
+# From the LOGO variable we can know if Addigy og Mosyle is used, so if that variable
+# is either of these, and this variable is empty, then we can will auto detect this.
+
+# Datadog logging used
+datadogAPI=""
+# Simply add your own API key for this in order to have logs sent to Datadog
+# See more here: https://www.datadoghq.com/product/log-management/
+
+# Log Date format used when parsing logs for debugging, this is the default used by
+# install.log, override this in the case statements if you need something custom per
+# application (See adobeillustrator).  Using stadard GNU Date formatting.
+LogDateFormat="%Y-%m-%d %H:%M:%S"
+
+# Get the start time for parsing install.log if we fail.
+starttime=$(date "+$LogDateFormat")
+
+# Check if we have rosetta installed
+if [[ $(/usr/bin/arch) == "arm64" ]]; then
+    if ! arch -x86_64 /usr/bin/true >/dev/null 2>&1; then # pgrep oahd >/dev/null 2>&1
+        rosetta2=no
+    fi
+fi

From c0ce59a1ec81e09e8a86122c0f8570cd8a729ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Wed, 12 Jan 2022 13:55:40 +0100
Subject: [PATCH 2/9] Update functions.sh

---
 fragments/functions.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fragments/functions.sh b/fragments/functions.sh
index dd20375..c7184be 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -113,10 +113,11 @@ printlog(){
     if [[ $logrepeat -gt 1 ]];then
         echo "$timestamp" : "${log_priority} : ${VERSIONDATE//-/} : Last Log repeated ${logrepeat} times" | tee -a $log_location
 
-    if [[ ! -z $datadogAPI ]]; then
-        curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : $APPLICATION : $VERSIONDATE : $SESSION : Last Log repeated ${logrepeat} times" > /dev/null
+        if [[ ! -z $datadogAPI ]]; then
+            curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : $APPLICATION : $VERSIONDATE : $SESSION : Last Log repeated ${logrepeat} times" > /dev/null
+        fi
+        logrepeat=0
     fi
-    logrepeat=0
 
     # If the datadogAPI key value is set and our logging level is greaterthan or equal to our set level
     # then post to Datadog's HTTPs endpoint.

From 99b908f646065bd62d84fb9c078038a203707af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Wed, 12 Jan 2022 21:34:16 +0100
Subject: [PATCH 3/9] Logging

---
 fragments/functions.sh | 115 ++++++++++++++++++++++++++++-------------
 fragments/main.sh      |  14 +++--
 2 files changed, 90 insertions(+), 39 deletions(-)

diff --git a/fragments/functions.sh b/fragments/functions.sh
index c7184be..5540875 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -1,23 +1,24 @@
 # MARK: Functions
 
-cleanupAndExit() { # $1 = exit code, $2 message
-    if [[ -n $2 && $1 -ne 0 ]]; then
-        printlog "ERROR: $2"
-    fi
+cleanupAndExit() { # $1 = exit code, $2 message, $3 level
     if [ "$DEBUG" -ne 1 ]; then
         # remove the temporary working directory when done
-        printlog "Deleting $tmpDir"
+        printlog "Deleting $tmpDir" DEBUG
         rm -Rf "$tmpDir"
     fi
 
     if [ -n "$dmgmount" ]; then
         # unmount disk image
-        printlog "Unmounting $dmgmount"
+        printlog "Unmounting $dmgmount" DEBUG
         hdiutil detach "$dmgmount"
     fi
     # If we closed any processes, reopen the app again
     reopenClosedProcess
-    printlog "################## End Installomator, exit code $1 \n\n"
+    if [[ -n $2 && $1 -ne 0 ]]; then
+        printlog "ERROR: $2" $3
+    fi
+    printlog "################## End Installomator, exit code $1 \n\n" REQ
+    
     # if label is wrong and we wanted name of the label, then return ##################
     if [[ $RETURN_LABEL_NAME -eq 1 ]]; then
         echo "#"
@@ -294,7 +295,7 @@ getAppVersion() {
 checkRunningProcesses() {
     # don't check in DEBUG mode 1
     if [[ $DEBUG -eq 1 ]]; then
-        printlog "DEBUG mode 1, not checking for blocking processes"
+        printlog "DEBUG mode 1, not checking for blocking processes" DEBUG
         return
     fi
 
@@ -386,7 +387,7 @@ checkRunningProcesses() {
         cleanupAndExit 11 "could not quit all processes, aborting..."
     fi
 
-    printlog "no more blocking processes, continue with update"
+    printlog "no more blocking processes, continue with update" REQ
 }
 
 reopenClosedProcess() {
@@ -401,7 +402,7 @@ reopenClosedProcess() {
 
     # don't reopen in DEBUG mode 1
     if [[ $DEBUG -eq 1 ]]; then
-        printlog "DEBUG mode 1, not reopening anything"
+        printlog "DEBUG mode 1, not reopening anything" DEBUG
         return
     fi
 
@@ -428,15 +429,21 @@ installAppWithPath() { # $1: path to app to install in $targetDir
     fi
 
     # verify with spctl
-    printlog "Verifying: $appPath"
-    if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then
-        cleanupAndExit 4 "Error verifying $appPath"
+    printlog "Verifying: $appPath" INFO
+    appVerify=$(spctl -a -vv "$appPath" 2>&1 )
+    appVerifyStatus=$(echo $?)
+    teamID=$(echo $appVerify | awk '/origin=/ {print $NF }' | tr -d '()' )
+    deduplicatelogs "$appVerify"
+    printlog "Debugging enabled, App Verification output was: $logoutput" DEBUG
+    
+    if [[ $appVerifyStatus -ne 0 ]] ; then
+    #if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then
+        cleanupAndExit 4 "Error verifying $appPath error: $logoutput" ERROR
     fi
-
-    printlog "Team ID matching: $teamID (expected: $expectedTeamID )"
+    printlog "Team ID matching: $teamID (expected: $expectedTeamID )" INFO
 
     if [ "$expectedTeamID" != "$teamID" ]; then
-        cleanupAndExit 5 "Team IDs do not match"
+        cleanupAndExit 5 "Team IDs do not match" ERROR
     fi
 
     # app versioncheck
@@ -474,13 +481,13 @@ installAppWithPath() { # $1: path to app to install in $targetDir
 
     # skip install for DEBUG 1
     if [ "$DEBUG" -eq 1 ]; then
-        printlog "DEBUG mode 1 enabled, skipping remove, copy and chown steps"
+        printlog "DEBUG mode 1 enabled, skipping remove, copy and chown steps" DEBUG
         return 0
     fi
 
     # skip install for DEBUG 2
     if [ "$DEBUG" -eq 2 ]; then
-        printlog "DEBUG mode 2 enabled, exiting"
+        printlog "DEBUG mode 2 enabled, exiting" DEBUG
         cleanupAndExit 0
     fi
 
@@ -551,24 +558,26 @@ installFromPKG() {
     # verify with spctl
     printlog "Verifying: $archiveName"
 
-    if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then
-        printlog "Error verifying $archiveName"
-        cleanupAndExit 4
+    spctlOut=$(spctl -a -vv -t install "$archiveName" 2>&1 )
+    spctlStatus=$(echo $?)
+    printlog "spctlOut is $spctlOut" DEBUG
+    teamID=$(echo $spctlOut | awk -F '(' '/origin=/ {print $2 }' | tr -d '()' )
+    deduplicatelogs "$spctlOut" # Why this?
+    
+    if [[ $spctlStatus -ne 0 ]] ; then
+    #if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then
+        cleanupAndExit 4 "Error verifying $archiveName error: $logoutput" ERROR
     fi
 
-    teamID=$(echo $spctlout | awk -F '(' '/origin=/ {print $2 }' | tr -d '()' )
-
     # Apple signed software has no teamID, grab entire origin instead
     if [[ -z $teamID ]]; then
         teamID=$(echo $spctlout | awk -F '=' '/origin=/ {print $NF }')
     fi
 
-
     printlog "Team ID: $teamID (expected: $expectedTeamID )"
 
     if [ "$expectedTeamID" != "$teamID" ]; then
-        printlog "Team IDs do not match!"
-        cleanupAndExit 5
+        cleanupAndExit 5 "Team IDs do not match!" ERROR
     fi
 
     # Check version of pkg to be installed if packageID is set
@@ -597,22 +606,39 @@ installFromPKG() {
 
     # skip install for DEBUG 1
     if [ "$DEBUG" -eq 1 ]; then
-        printlog "DEBUG enabled, skipping installation"
+        printlog "DEBUG enabled, skipping installation" DEBUG
         return 0
     fi
 
     # skip install for DEBUG 2
     if [ "$DEBUG" -eq 2 ]; then
-        printlog "DEBUG mode 2 enabled, exiting"
-        cleanupAndExit 0
+        cleanupAndExit 0 "DEBUG mode 2 enabled, exiting" DEBUG
     fi
 
     # install pkg
     printlog "Installing $archiveName to $targetDir"
-    if ! installer -pkg "$archiveName" -tgt "$targetDir" ; then
-        printlog "error installing $archiveName"
-        cleanupAndExit 9
+    pkgInstall=$(installer -verbose -dumplog -pkg "$archiveName" -tgt "$targetDir" 2>&1)
+    pkgInstallStatus=$(echo $?)
+    sleep 1
+    pkgEndTime=$(date "+$LogDateFormat")
+    pkgInstall+=$(echo "Output of /var/log/install.log below this line.\n")
+    pkgInstall+=$(echo "----------------------------------------------------------\n")
+    pkgInstall+=$(awk -v "b=$starttime" -v "e=$pkgEndTime" -F ',' '$1 >= b && $1 <= e' /var/log/install.log)
+    deduplicatelogs "$pkgInstall"
+
+    if [[ $pkgInstallStatus -ne 0 ]] && [[ $logoutput == *"requires Rosetta 2"* ]] && [[ $rosetta2 == no ]]; then
+        printlog "Package requires Rosetta 2, Installing Rosetta 2 and Installing Package" INFO
+        /usr/sbin/softwareupdate --install-rosetta --agree-to-license
+        rosetta2=yes
+        installFromPKG
     fi
+
+    if [ $pkginstallstatus -ne 0 ] ; then
+    #if ! installer -pkg "$archiveName" -tgt "$targetDir" ; then
+        cleanupAndExit 9 "Error installing $archiveName error: $logoutput" ERROR
+        
+    fi
+    printlog "Debugging enabled, installer output was: $logoutput" DEBUG
 }
 
 installFromZIP() {
@@ -738,12 +764,29 @@ runUpdateTool() {
     if [[ -x $updateTool ]]; then
         printlog "running $updateTool $updateToolArguments"
         if [[ -n $updateToolRunAsCurrentUser ]]; then
-            runAsUser $updateTool ${updateToolArguments}
+            updateOutput=$(runAsUser $updateTool ${updateToolArguments} 2>&1)
+            updateStatus=$(echo $?)
         else
-            $updateTool ${updateToolArguments}
+            updateOutput=$($updateTool ${updateToolArguments} 2>&1)
+            updateStatus=$(echo $?)
         fi
-        if [[ $? -ne 0 ]]; then
-            cleanupAndExit 15 "Error running $updateTool"
+        sleep 1
+        updateEndTime=$(date "+$updateToolLogDateFormat")
+        deduplicatelogs $updateOutput
+        if [[ -n $updateToolLog ]]; then
+            updateOutput+=$(echo "Output of Installer log of $updateToolLog below this line.\n")
+            updateOutput+=$(echo "----------------------------------------------------------\n")
+            updateOutput+=$(awk -v "b=$updatestarttime" -v "e=$updateEndTime" -F ',' '$1 >= b && $1 <= e' $updateToolLog)
+        fi
+
+        if [[ $updateStatus -ne 0 ]]; then
+            printlog "Error running $updateTool, Procceding with normal installation. Exit Status: $updateStatus Error: $logoutput" WARN
+            return 1
+            if [[ $type == updateronly ]]; then
+                cleanupAndExit 77 "No Download URL Set, this is an update only application and the updater failed" WARN
+            fi
+        elif [[ $updateStatus -eq 0 ]]; then
+            printlog "Debugging enabled, update tool output was: $logoutput" DEBUG
         fi
     else
         printlog "couldn't find $updateTool, continuing normally"
diff --git a/fragments/main.sh b/fragments/main.sh
index cef364c..e8bc2bf 100644
--- a/fragments/main.sh
+++ b/fragments/main.sh
@@ -35,14 +35,17 @@ case $LOGO in
     mosyleb)
         # Mosyle Business
         LOGO="/Applications/Self-Service.app/Contents/Resources/AppIcon.icns"
+        if [[ -z $MDMProfileName ]]; then; MDMProfileName="Mosyle Corporation MDM"; fi
         ;;
     mosylem)
         # Mosyle Manager (education)
         LOGO="/Applications/Manager.app/Contents/Resources/AppIcon.icns"
+        if [[ -z $MDMProfileName ]]; then; MDMProfileName="Mosyle Corporation MDM"; fi
         ;;
     addigy)
         # Addigy
         LOGO="/Library/Addigy/macmanage/MacManage.app/Contents/Resources/atom.icns"
+        if [[ -z $MDMProfileName ]]; then; MDMProfileName="MDM Profile"; fi
         ;;
 esac
 if [[ ! -a "${LOGO}" ]]; then
@@ -112,7 +115,7 @@ else
 fi
 
 # MARK: change directory to temporary working directory
-printlog "Changing directory to $tmpDir"
+printlog "Changing directory to $tmpDir" DEBUG
 if ! cd "$tmpDir"; then
     printlog "error changing directory $tmpDir"
     cleanupAndExit 1
@@ -178,7 +181,12 @@ else
             displaynotification "Downloading new $name" "Download in progress …"
         fi
     fi
-    if ! curl --location --fail --silent "$downloadURL" -o "$archiveName"; then
+    curlDownload=$(curl -v -fsL --show-error "$downloadURL" -o "$archiveName" 2>&1)
+    curlDownloadStatus=$(echo $?)
+    deduplicatelogs "$curlDownload"
+    printlog "curl output was: $logoutput" DEBUG
+    if [[ $curlDownloadStatus -ne 0 ]]; then
+    #if ! curl --location --fail --silent "$downloadURL" -o "$archiveName"; then
         printlog "error downloading $downloadURL"
         message="$name update/installation failed. This will be logged, so IT can follow up."
         if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
@@ -189,7 +197,7 @@ else
                 displaynotification "$message" "Error installing $name"
             fi
         fi
-        cleanupAndExit 2
+        cleanupAndExit 2 "Error downloading $downloadURL error: $logoutput" ERROR
     fi
 fi
 

From f96cd178c6abf0186bd5341bd3212454a24a43a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 13 Jan 2022 09:44:34 +0100
Subject: [PATCH 4/9] CLIInstaller included

and a few other displaylog lines changed
---
 CHANGELOG.md           | 10 ++++++++--
 fragments/functions.sh | 41 +++++++++++++++++++++++------------------
 fragments/header.sh    |  2 +-
 fragments/main.sh      | 12 ++++++------
 4 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2843dd..f08aa97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,15 @@
 - Added variable `SYSTEMOWNER` that is used when copying files when installing. Default `0` is to change owner of the app to the current user on the Mac, like this user was installing this app themselves. When using `1` we will put “root:wheel” on the app, which can be useful for shared machines.
 
 Big changes to logging:
-- Logging levels as DEBUG 0 INFO 1 WARN 2 ERROR 3 REQ 4
+- Introducing variable `LOGGING`, that can be either of the logging levels
+- Logging levels:
+    0: DEBUG     Everything is logged
+    1: INFO      Normal logging behavior
+    2: WARN
+    3: ERROR
+    4: REQ
 - External logging to Datadog
-- A function to shorten duplicate lines in installation logs
+- A function to shorten duplicate lines in installation logs or output of longer commands
 - Ability to extract install.log in the time when Installomator was running, if further investigations needs to be done to logs
 
 ## v8.0
diff --git a/fragments/functions.sh b/fragments/functions.sh
index 5540875..3960e39 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -415,7 +415,7 @@ reopenClosedProcess() {
         processuser=$(ps aux | grep -i "${appName}" | grep -vi "grep" | awk '{print $1}')
         printlog "Reopened ${appName} as $processuser"
     else
-        printlog "App not closed, so no reopen."
+        printlog "App not closed, so no reopen." DEBUG
     fi
 }
 
@@ -434,12 +434,12 @@ installAppWithPath() { # $1: path to app to install in $targetDir
     appVerifyStatus=$(echo $?)
     teamID=$(echo $appVerify | awk '/origin=/ {print $NF }' | tr -d '()' )
     deduplicatelogs "$appVerify"
-    printlog "Debugging enabled, App Verification output was: $logoutput" DEBUG
-    
+
     if [[ $appVerifyStatus -ne 0 ]] ; then
     #if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then
         cleanupAndExit 4 "Error verifying $appPath error: $logoutput" ERROR
     fi
+    printlog "Debugging enabled, App Verification output was: $logoutput" DEBUG
     printlog "Team ID matching: $teamID (expected: $expectedTeamID )" INFO
 
     if [ "$expectedTeamID" != "$teamID" ]; then
@@ -511,24 +511,24 @@ installAppWithPath() { # $1: path to app to install in $targetDir
             printlog "Changing owner to $currentUser"
             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" 
             chown -R root:wheel "$targetDir/$appName"
         fi
 
     elif [[ ! -z $CLIInstaller ]]; then
         mountname=$(dirname $appPath)
-        printlog "CLIInstaller exists, running installer command $mountname/$CLIInstaller $CLIArguments" #INFO
+        printlog "CLIInstaller exists, running installer command $mountname/$CLIInstaller $CLIArguments" INFO
 
         CLIoutput=$("$mountname/$CLIInstaller" "${CLIArguments[@]}" 2>&1)
         CLIstatus=$(echo $?)
-        logoutput="$CLIoutput" # dedupliatelogs "$CLIoutput"
+        dedupliatelogs "$CLIoutput"
 
         if [ $CLIstatus -ne 0 ] ; then
-            cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error:\n$logoutput" #ERROR
+            cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error: $logoutput" ERROR
         else
-            printlog "Succesfully ran $mountname/$CLIInstaller $CLIArguments"
+            printlog "Succesfully ran $mountname/$CLIInstaller $CLIArguments" INFO
         fi
-        printlog "Debugging enabled, update tool output was:\n$logoutput" #DEBUG
+        printlog "Debugging enabled, update tool output was: $logoutput" DEBUG
     fi
 
 }
@@ -537,16 +537,22 @@ mountDMG() {
     # mount the dmg
     printlog "Mounting $tmpDir/$archiveName"
     # always pipe 'Y\n' in case the dmg requires an agreement
-    if ! dmgmount=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
-        cleanupAndExit 3 "Error mounting $tmpDir/$archiveName"
+    dmgmountOut=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly )
+    dmgmountStatus=$(echo $?)
+    dmgmount=$(echo $dmgmountOut | tail -n 1 | cut -c 54- )
+    printlog "dmgmountOut is $dmgmountOut" DEBUG
+    deduplicatelogs "$dmgmountOut"
+    
+    if [[ $dmgmountStatus -ne 0 ]] ; then
+    #if ! dmgmount=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
+        cleanupAndExit 3 "Error mounting $tmpDir/$archiveName error: $logoutput" ERROR
     fi
-
     if [[ ! -e $dmgmount ]]; then
-        printlog "Error mounting $tmpDir/$archiveName"
-        cleanupAndExit 3
+        cleanupAndExit 3 "Error accessing mountpoint for $tmpDir/$archiveName error: $logoutput" ERROR
     fi
-
-    printlog "Mounted: $dmgmount"
+    printlog "Debugging enabled, installer output was: $logoutput" DEBUG
+    
+    printlog "Mounted: $dmgmount" INFO
 }
 
 installFromDMG() {
@@ -562,7 +568,7 @@ installFromPKG() {
     spctlStatus=$(echo $?)
     printlog "spctlOut is $spctlOut" DEBUG
     teamID=$(echo $spctlOut | awk -F '(' '/origin=/ {print $2 }' | tr -d '()' )
-    deduplicatelogs "$spctlOut" # Why this?
+    deduplicatelogs "$spctlOut"
     
     if [[ $spctlStatus -ne 0 ]] ; then
     #if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then
@@ -636,7 +642,6 @@ installFromPKG() {
     if [ $pkginstallstatus -ne 0 ] ; then
     #if ! installer -pkg "$archiveName" -tgt "$targetDir" ; then
         cleanupAndExit 9 "Error installing $archiveName error: $logoutput" ERROR
-        
     fi
     printlog "Debugging enabled, installer output was: $logoutput" DEBUG
 }
diff --git a/fragments/header.sh b/fragments/header.sh
index 27bc57f..fbd926b 100644
--- a/fragments/header.sh
+++ b/fragments/header.sh
@@ -255,7 +255,7 @@ MDMProfileName=""
 #   - MDM Profile               Addigy has this name on the profile
 #   - Mosyle Corporation MDM    Mosyle uses this name on the profile
 # From the LOGO variable we can know if Addigy og Mosyle is used, so if that variable
-# is either of these, and this variable is empty, then we can will auto detect this.
+# is either of these, and this variable is empty, then we will auto detect this.
 
 # Datadog logging used
 datadogAPI=""
diff --git a/fragments/main.sh b/fragments/main.sh
index e8bc2bf..35723f6 100644
--- a/fragments/main.sh
+++ b/fragments/main.sh
@@ -172,7 +172,7 @@ if [ -f "$archiveName" ] && [ "$DEBUG" -eq 1 ]; then
     printlog "$archiveName exists and DEBUG mode 1 enabled, skipping download"
 else
     # download the dmg
-    printlog "Downloading $downloadURL to $archiveName"
+    printlog "Downloading $downloadURL to $archiveName" REQ
     if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
         printlog "notifying"
         if [[ $updateDetected == "YES" ]]; then
@@ -181,7 +181,7 @@ else
             displaynotification "Downloading new $name" "Download in progress …"
         fi
     fi
-    curlDownload=$(curl -v -fsL --show-error "$downloadURL" -o "$archiveName" 2>&1)
+    curlDownload=$(curl -v -fsL --show-error ${curlOptions} "$downloadURL" -o "$archiveName" 2>&1)
     curlDownloadStatus=$(echo $?)
     deduplicatelogs "$curlDownload"
     printlog "curl output was: $logoutput" DEBUG
@@ -192,9 +192,9 @@ else
         if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
             printlog "notifying"
             if [[ $updateDetected == "YES" ]]; then
-                displaynotification "$message" "Error updating $name"
+                displaynotification "$message" "Error updating $name" ERROR
             else
-                displaynotification "$message" "Error installing $name"
+                displaynotification "$message" "Error installing $name" ERROR
             fi
         fi
         cleanupAndExit 2 "Error downloading $downloadURL error: $logoutput" ERROR
@@ -215,7 +215,7 @@ else
 fi
 
 # MARK: install the download
-printlog "Installing $name"
+printlog "Installing $name" REQ
 if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
     printlog "notifying"
     if [[ $updateDetected == "YES" ]]; then
@@ -227,7 +227,7 @@ fi
 
 if [ -n "$installerTool" ]; then
     # installerTool defined, and we use that for installation
-    printlog "installerTool used: $installerTool"
+    printlog "installerTool used: $installerTool" REQ
     appName="$installerTool"
 fi
 

From 82faf74eb301a0ce99205ba74d7d08819d223a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 13 Jan 2022 14:12:51 +0100
Subject: [PATCH 5/9] Update functions.sh

---
 fragments/functions.sh | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/fragments/functions.sh b/fragments/functions.sh
index 3960e39..fdbd066 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -190,8 +190,7 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
     | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
     fi
     if [ -z "$downloadURL" ]; then
-        cleanupAndExit 9 "could not retrieve download URL for $gitusername/$gitreponame"
-        #exit 9
+        cleanupAndExit 9 "could not retrieve download URL for $gitusername/$gitreponame" ERROR
     else
         echo "$downloadURL"
         return 0
@@ -259,9 +258,9 @@ getAppVersion() {
         applist=$(mdfind "kind:application $appName" -0 )
     fi
     if [[ -z applist ]]; then
-        printlog "No previous app found"
+        printlog "No previous app found" DEBUG
     else
-        printlog "App(s) found: ${applist}"
+        printlog "App(s) found: ${applist}" DEBUG
     fi
 
     appPathArray=( ${(0)applist} )
@@ -281,7 +280,7 @@ getAppVersion() {
                     printlog "Replacing App Store apps, no matter the version"
                     appversion=0
                 else
-                    cleanupAndExit 1 "App previously installed from App Store, and we respect that"
+                    cleanupAndExit 1 "App previously installed from App Store, and we respect that" ERROR
                 fi
             fi
         else
@@ -328,7 +327,7 @@ checkRunningProcesses() {
                     prompt_user|prompt_user_then_kill)
                       button=$(displaydialog "Quit “$x” to continue updating? (Leave this dialogue if you want to activate this update later)." "The application “$x” needs to be updated.")
                       if [[ $button = "Not Now" ]]; then
-                        cleanupAndExit 10 "user aborted update"
+                        cleanupAndExit 10 "user aborted update" ERROR
                       else
                         if [[ $i > 2 && $BLOCKING_PROCESS_ACTION = "prompt_user_then_kill" ]]; then
                           printlog "Changing BLOCKING_PROCESS_ACTION to kill"
@@ -373,7 +372,7 @@ checkRunningProcesses() {
                       fi
                       ;;
                     silent_fail)
-                      cleanupAndExit 12 "blocking process '$x' found, aborting"
+                      cleanupAndExit 12 "blocking process '$x' found, aborting" ERROR
                       ;;
                 esac
 
@@ -384,7 +383,7 @@ checkRunningProcesses() {
     done
 
     if [[ $countedProcesses -ne 0 ]]; then
-        cleanupAndExit 11 "could not quit all processes, aborting..."
+        cleanupAndExit 11 "could not quit all processes, aborting..." ERROR
     fi
 
     printlog "no more blocking processes, continue with update" REQ
@@ -425,7 +424,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
 
     # check if app exists
     if [ ! -e "$appPath" ]; then
-        cleanupAndExit 8 "could not find: $appPath"
+        cleanupAndExit 8 "could not find: $appPath" DEBUG
     fi
 
     # verify with spctl
@@ -456,7 +455,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"
+            cleanupAndExit 0 "No new version to install" INFO
         else
             printlog "Using force to install anyway."
         fi
@@ -475,7 +474,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
                 printlog "notifying"
                 displaynotification "$message" "Error updating $name!"
             fi
-            cleanupAndExit 6 "Installed macOS is too old for this app."
+            cleanupAndExit 6 "Installed macOS is too old for this app." INFO
         fi
     fi
 
@@ -496,14 +495,14 @@ installAppWithPath() { # $1: path to app to install in $targetDir
 
         # remove existing application
         if [ -e "$targetDir/$appName" ]; then
-            printlog "Removing existing $targetDir/$appName"
+            printlog "Removing existing $targetDir/$appName" DEBUG
             rm -Rf "$targetDir/$appName"
         fi
 
         # copy app to /Applications
         printlog "Copy $appPath to $targetDir"
         if ! ditto "$appPath" "$targetDir/$appName"; then
-            cleanupAndExit 7 "Error while copying"
+            cleanupAndExit 7 "Error while copying" ERROR
         fi
 
         # set ownership to current user
@@ -603,7 +602,7 @@ installFromPKG() {
                     printlog "notifying"
                     displaynotification "$message" "No update for $name!"
                 fi
-                cleanupAndExit 0 "No new version to install"
+                cleanupAndExit 0 "No new version to install" INFO
             else
                 printlog "Using force to install anyway."
             fi
@@ -679,7 +678,7 @@ installPkgInDmg() {
         findfiles=$(find "$dmgmount" -iname "*.pkg" -maxdepth 1  )
         filearray=( ${(f)findfiles} )
         if [[ ${#filearray} -eq 0 ]]; then
-            cleanupAndExit 20 "couldn't find pkg in dmg $archiveName"
+            cleanupAndExit 20 "couldn't find pkg in dmg $archiveName" ERROR
         fi
         archiveName="${filearray[1]}"
         printlog "found pkg: $archiveName"
@@ -691,7 +690,7 @@ installPkgInDmg() {
             findfiles=$(find "$tmpDir" -iname "$pkgName")
             filearray=( ${(f)findfiles} )
             if [[ ${#filearray} -eq 0 ]]; then
-                cleanupAndExit 20 "couldn't find pkg “$pkgName” in zip $archiveName"
+                cleanupAndExit 20 "couldn't find pkg “$pkgName” in zip $archiveName" ERROR
             fi
             # it is now safe to overwrite archiveName for installFromPKG
             archiveName="${filearray[1]}"
@@ -714,7 +713,7 @@ installPkgInZip() {
         findfiles=$(find "$tmpDir" -iname "*.pkg" -maxdepth 2  )
         filearray=( ${(f)findfiles} )
         if [[ ${#filearray} -eq 0 ]]; then
-            cleanupAndExit 20 "couldn't find pkg in zip $archiveName"
+            cleanupAndExit 20 "couldn't find pkg in zip $archiveName" ERROR
         fi
         # it is now safe to overwrite archiveName for installFromPKG
         archiveName="${filearray[1]}"
@@ -727,7 +726,7 @@ installPkgInZip() {
             findfiles=$(find "$tmpDir" -iname "$pkgName")
             filearray=( ${(f)findfiles} )
             if [[ ${#filearray} -eq 0 ]]; then
-                cleanupAndExit 20 "couldn't find pkg “$pkgName” in zip $archiveName"
+                cleanupAndExit 20 "couldn't find pkg “$pkgName” in zip $archiveName" ERROR
             fi
             # it is now safe to overwrite archiveName for installFromPKG
             archiveName="${filearray[1]}"
@@ -750,7 +749,7 @@ installAppInDmgInZip() {
         findfiles=$(find "$tmpDir" -iname "*.dmg" -maxdepth 2  )
         filearray=( ${(f)findfiles} )
         if [[ ${#filearray} -eq 0 ]]; then
-            cleanupAndExit 20 "couldn't find dmg in zip $archiveName"
+            cleanupAndExit 20 "couldn't find dmg in zip $archiveName" ERROR
         fi
         archiveName="$(basename ${filearray[1]})"
         # it is now safe to overwrite archiveName for installFromDMG

From 7f2bdfb1df92c62f53592a9d6ab5d7157b8c1467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 13 Jan 2022 21:52:15 +0100
Subject: [PATCH 6/9] Local logging improvements

Improved first lines of logs to be required and show `VERSION` and `VERSIONDATE` on separate lines.
Logging sent to Datadog will have `VERSION` on each line.
---
 fragments/arguments.sh |  8 +++++---
 fragments/functions.sh | 14 ++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/fragments/arguments.sh b/fragments/arguments.sh
index 6c01519..ea6e9db 100644
--- a/fragments/arguments.sh
+++ b/fragments/arguments.sh
@@ -43,12 +43,14 @@ if [[ $label == "version" ]]; then
     exit 0
 fi
 
-printlog "################## Start Installomator v. $VERSION"
-printlog "################## $label"
+printlog "################## Start Installomator" REQ
+printlog "################## Version: $VERSION" REQ
+printlog "################## Date: $VERSIONDATE" REQ
+printlog "################## $label" REQ
 
 # Check for DEBUG mode
 if [[ $DEBUG -gt 0 ]]; then
-    printlog "DEBUG mode $DEBUG enabled."
+    printlog "DEBUG mode $DEBUG enabled." DEBUG
 fi
 
 # How we get version number from app
diff --git a/fragments/functions.sh b/fragments/functions.sh
index fdbd066..5e0ea55 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -112,10 +112,10 @@ printlog(){
 
     # Once we finally stop getting duplicate logs output the number of times we got a duplicate.
     if [[ $logrepeat -gt 1 ]];then
-        echo "$timestamp" : "${log_priority} : ${VERSIONDATE//-/} : Last Log repeated ${logrepeat} times" | tee -a $log_location
+        echo "$timestamp" : "${log_priority} : Last Log repeated ${logrepeat} times" | tee -a $log_location
 
         if [[ ! -z $datadogAPI ]]; then
-            curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : $APPLICATION : $VERSIONDATE : $SESSION : Last Log repeated ${logrepeat} times" > /dev/null
+            curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : $APPLICATION : $VERSION : $SESSION : Last Log repeated ${logrepeat} times" > /dev/null
         fi
         logrepeat=0
     fi
@@ -132,18 +132,12 @@ printlog(){
     if [[ ${levels[$log_priority]} -ge ${levels[$LOGGING]} ]]; then
         while IFS= read -r logmessage; do
             if [[ "$(whoami)" == "root" ]]; then
-                echo "$timestamp" : "${log_priority} : ${VERSIONDATE//-/} : ${logmessage}" | tee -a $log_location
+                echo "$timestamp" : "${log_priority} : ${logmessage}" | tee -a $log_location
             else
-                echo "$timestamp" : "${log_priority} : ${VERSIONDATE//-/} : ${logmessage}"
+                echo "$timestamp" : "${log_priority} : ${logmessage}"
             fi
         done <<< "$log_message"
     fi
-
-#    if [[ "$(whoami)" == "root" ]]; then
-#        echo "$timestamp" "$label" "$1" | tee -a $log_location
-#    else
-#        echo "$timestamp" "$label" "$1"
-#    fi
 }
 
 # Used to remove dupplicate lines in large log output, for example from msupdate command

From fee93947516536f75754b3f86e72c3a580ab1cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 14 Jan 2022 10:02:00 +0100
Subject: [PATCH 7/9] Few more DEBUG loggings

---
 fragments/functions.sh | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/fragments/functions.sh b/fragments/functions.sh
index 5e0ea55..cb20292 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -4,13 +4,15 @@ cleanupAndExit() { # $1 = exit code, $2 message, $3 level
     if [ "$DEBUG" -ne 1 ]; then
         # remove the temporary working directory when done
         printlog "Deleting $tmpDir" DEBUG
-        rm -Rf "$tmpDir"
+        deleteTmpOut=$(rm -Rfv "$tmpDir")
+        printlog "Debugging enabled, Deleting tmpDir output was:\n$deleteTmpOut" DEBUG
     fi
 
     if [ -n "$dmgmount" ]; then
         # unmount disk image
         printlog "Unmounting $dmgmount" DEBUG
-        hdiutil detach "$dmgmount"
+        unmountingOut=$(hdiutil detach "$dmgmount" 2>&1)
+        printlog "Debugging enabled, Unmounting output was:\n$unmountingOut" DEBUG
     fi
     # If we closed any processes, reopen the app again
     reopenClosedProcess
@@ -430,9 +432,9 @@ installAppWithPath() { # $1: path to app to install in $targetDir
 
     if [[ $appVerifyStatus -ne 0 ]] ; then
     #if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then
-        cleanupAndExit 4 "Error verifying $appPath error: $logoutput" ERROR
+        cleanupAndExit 4 "Error verifying $appPath error:\n$logoutput" ERROR
     fi
-    printlog "Debugging enabled, App Verification output was: $logoutput" DEBUG
+    printlog "Debugging enabled, App Verification output was:\n$logoutput" DEBUG
     printlog "Team ID matching: $teamID (expected: $expectedTeamID )" INFO
 
     if [ "$expectedTeamID" != "$teamID" ]; then
@@ -480,7 +482,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
 
     # skip install for DEBUG 2
     if [ "$DEBUG" -eq 2 ]; then
-        printlog "DEBUG mode 2 enabled, exiting" DEBUG
+        printlog "DEBUG mode 2 enabled, not installing anything, exiting" DEBUG
         cleanupAndExit 0
     fi
 
@@ -490,7 +492,8 @@ installAppWithPath() { # $1: path to app to install in $targetDir
         # remove existing application
         if [ -e "$targetDir/$appName" ]; then
             printlog "Removing existing $targetDir/$appName" DEBUG
-            rm -Rf "$targetDir/$appName"
+            deleteAppOut=$(rm -Rfv "$targetDir/$appName" 2>&1)
+            printlog "Debugging enabled, App removing output was:\n$deleteAppOut" DEBUG
         fi
 
         # copy app to /Applications
@@ -517,11 +520,11 @@ installAppWithPath() { # $1: path to app to install in $targetDir
         dedupliatelogs "$CLIoutput"
 
         if [ $CLIstatus -ne 0 ] ; then
-            cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error: $logoutput" ERROR
+            cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error:\n$logoutput" ERROR
         else
             printlog "Succesfully ran $mountname/$CLIInstaller $CLIArguments" INFO
         fi
-        printlog "Debugging enabled, update tool output was: $logoutput" DEBUG
+        printlog "Debugging enabled, update tool output was:\n$logoutput" DEBUG
     fi
 
 }
@@ -538,12 +541,12 @@ mountDMG() {
     
     if [[ $dmgmountStatus -ne 0 ]] ; then
     #if ! dmgmount=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
-        cleanupAndExit 3 "Error mounting $tmpDir/$archiveName error: $logoutput" ERROR
+        cleanupAndExit 3 "Error mounting $tmpDir/$archiveName error:\n$logoutput" ERROR
     fi
     if [[ ! -e $dmgmount ]]; then
-        cleanupAndExit 3 "Error accessing mountpoint for $tmpDir/$archiveName error: $logoutput" ERROR
+        cleanupAndExit 3 "Error accessing mountpoint for $tmpDir/$archiveName error:\n$logoutput" ERROR
     fi
-    printlog "Debugging enabled, installer output was: $logoutput" DEBUG
+    printlog "Debugging enabled, installer output was:\n$logoutput" DEBUG
     
     printlog "Mounted: $dmgmount" INFO
 }
@@ -565,7 +568,7 @@ installFromPKG() {
     
     if [[ $spctlStatus -ne 0 ]] ; then
     #if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then
-        cleanupAndExit 4 "Error verifying $archiveName error: $logoutput" ERROR
+        cleanupAndExit 4 "Error verifying $archiveName error:\n$logoutput" ERROR
     fi
 
     # Apple signed software has no teamID, grab entire origin instead
@@ -634,9 +637,9 @@ installFromPKG() {
 
     if [ $pkginstallstatus -ne 0 ] ; then
     #if ! installer -pkg "$archiveName" -tgt "$targetDir" ; then
-        cleanupAndExit 9 "Error installing $archiveName error: $logoutput" ERROR
+        cleanupAndExit 9 "Error installing $archiveName error:\n$logoutput" ERROR
     fi
-    printlog "Debugging enabled, installer output was: $logoutput" DEBUG
+    printlog "Debugging enabled, installer output was:\n$logoutput" DEBUG
 }
 
 installFromZIP() {
@@ -778,13 +781,13 @@ runUpdateTool() {
         fi
 
         if [[ $updateStatus -ne 0 ]]; then
-            printlog "Error running $updateTool, Procceding with normal installation. Exit Status: $updateStatus Error: $logoutput" WARN
+            printlog "Error running $updateTool, Procceding with normal installation. Exit Status: $updateStatus Error:\n$logoutput" WARN
             return 1
             if [[ $type == updateronly ]]; then
                 cleanupAndExit 77 "No Download URL Set, this is an update only application and the updater failed" WARN
             fi
         elif [[ $updateStatus -eq 0 ]]; then
-            printlog "Debugging enabled, update tool output was: $logoutput" DEBUG
+            printlog "Debugging enabled, update tool output was:\n$logoutput" DEBUG
         fi
     else
         printlog "couldn't find $updateTool, continuing normally"

From e4a5f47272bfdb57019ea4996a06f8f2940a70ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 14 Jan 2022 10:14:29 +0100
Subject: [PATCH 8/9] Label on each log line (again)

---
 fragments/functions.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fragments/functions.sh b/fragments/functions.sh
index cb20292..3c6b17a 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -114,7 +114,7 @@ printlog(){
 
     # Once we finally stop getting duplicate logs output the number of times we got a duplicate.
     if [[ $logrepeat -gt 1 ]];then
-        echo "$timestamp" : "${log_priority} : Last Log repeated ${logrepeat} times" | tee -a $log_location
+        echo "$timestamp" : "${log_priority} : $label : Last Log repeated ${logrepeat} times" | tee -a $log_location
 
         if [[ ! -z $datadogAPI ]]; then
             curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : $APPLICATION : $VERSION : $SESSION : Last Log repeated ${logrepeat} times" > /dev/null
@@ -134,9 +134,9 @@ printlog(){
     if [[ ${levels[$log_priority]} -ge ${levels[$LOGGING]} ]]; then
         while IFS= read -r logmessage; do
             if [[ "$(whoami)" == "root" ]]; then
-                echo "$timestamp" : "${log_priority} : ${logmessage}" | tee -a $log_location
+                echo "$timestamp" : "${log_priority} : $label : ${logmessage}" | tee -a $log_location
             else
-                echo "$timestamp" : "${log_priority} : ${logmessage}"
+                echo "$timestamp" : "${log_priority} : $label : ${logmessage}"
             fi
         done <<< "$log_message"
     fi

From 621d6df3467c48b131166b748fc3065eab2532a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Sat, 22 Jan 2022 06:18:00 +0100
Subject: [PATCH 9/9] Update arguments.sh

---
 fragments/arguments.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fragments/arguments.sh b/fragments/arguments.sh
index ea6e9db..a73dafd 100644
--- a/fragments/arguments.sh
+++ b/fragments/arguments.sh
@@ -43,10 +43,10 @@ if [[ $label == "version" ]]; then
     exit 0
 fi
 
-printlog "################## Start Installomator" REQ
-printlog "################## Version: $VERSION" REQ
-printlog "################## Date: $VERSIONDATE" REQ
-printlog "################## $label" REQ
+printlog "################## Start Installomator v. $VERSION, date $VERSIONDATE" REQ
+printlog "################## Version: $VERSION" INFO
+printlog "################## Date: $VERSIONDATE" INFO
+printlog "################## $label" INFO
 
 # Check for DEBUG mode
 if [[ $DEBUG -gt 0 ]]; then