From 0a4c8cfe6eab8eded00b5b30069e11bb2bc96c32 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Wed, 21 Sep 2022 17:36:03 +0200
Subject: [PATCH] Cleaning

---
 .../App normal SS.sh                                 |  2 +-
 MDM/App-install/App normal Auto-install.sh           | 12 ++++++------
 MDM/App-install/App normal SS.sh                     |  3 ++-
 MDM/Installomator 1st Auto-install.sh                |  3 ++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
index 9420b4d..b1b1256 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
@@ -5,7 +5,7 @@
 LOGO="mosyleb" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
 item="cyberduck" # enter the software to install
-# Examples: microsoftedge, brave, googlechromepkg, firefoxpkg
+# Examples: adobecreativeclouddesktop, canva, cyberduck, handbrake, inkscape, textmate, vlc
 
 # Dialog icon
 icon=""
diff --git a/MDM/App-install/App normal Auto-install.sh b/MDM/App-install/App normal Auto-install.sh
index a43cdff..75bd4f0 100644
--- a/MDM/App-install/App normal Auto-install.sh	
+++ b/MDM/App-install/App normal Auto-install.sh	
@@ -4,7 +4,7 @@
 
 LOGO="mosyleb" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
-what="" # enter the software to install
+item="" # enter the software to install
 # Examples: adobecreativeclouddesktop, textmate, vlc
 
 installomatorOptions="BLOCKING_PROCESS_ACTION=tell_user" # Separated by space
@@ -28,7 +28,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=tell_user" # Separated by space
 #   INSTALL=force
 ######################################################################
 # To be used as a script sent out from a MDM.
-# Fill the variable "what" above with a label.
+# Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
@@ -38,7 +38,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=tell_user" # Separated by space
 # PATH declaration
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
-echo "$(date +%F\ %T) [LOG-BEGIN] $what"
+echo "$(date +%F\ %T) [LOG-BEGIN] $item"
 
 # Verify that Installomator has been installed
 destFile="/usr/local/Installomator/Installomator.sh"
@@ -59,16 +59,16 @@ caffexit () {
 }
 
 # Install software using Installomator
-cmdOutput="$(${destFile} ${what} LOGO=$LOGO ${installomatorOptions} || true)"
+cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true)"
 
 # Check result
 exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
 if [[ ${exitStatus} -eq 0 ]] ; then
-    echo "${what} succesfully installed."
+    echo "${item} succesfully installed."
     warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
     echo "$warnOutput"
 else
-    echo "ERROR installing ${what}. Exit code ${exitStatus}"
+    echo "ERROR installing ${item}. Exit code ${exitStatus}"
     echo "$cmdOutput"
     #errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
     #echo "$errorOutput"
diff --git a/MDM/App-install/App normal SS.sh b/MDM/App-install/App normal SS.sh
index 5481991..146e3f1 100644
--- a/MDM/App-install/App normal SS.sh	
+++ b/MDM/App-install/App normal SS.sh	
@@ -5,7 +5,8 @@
 LOGO="mosyleb" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
 what="" # enter the software to install
-# Examples: adobecreativeclouddesktop, textmate, vlc
+# Examples: adobecreativeclouddesktop, canva, cyberduck, handbrake, inkscape, textmate, vlc
+
 
 installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all" # Separated by space
 
diff --git a/MDM/Installomator 1st Auto-install.sh b/MDM/Installomator 1st Auto-install.sh
index cf37d9c..5bb2d70 100755
--- a/MDM/Installomator 1st Auto-install.sh	
+++ b/MDM/Installomator 1st Auto-install.sh	
@@ -17,7 +17,8 @@ errorMessage="A problem was encountered setting up this Mac. Please contact IT."
 ######################################################################
 # Installomator 1st
 #
-# Installation using Installomator (use separate Installation1stProgress script to show progress)
+# Installation using Installomator
+# (use separate Progress 1st script to show progress)
 # No customization below…
 ######################################################################
 # This script can be used to install software using Installomator.