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

Improved logging

Browse Source
This commit is contained in:
Theile
2022-10-21 14:01:59 +02:00
parent a7224fcbea
commit 2362e8a9d0
6 changed files with 57 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh
View File

@@ -5,7 +5,7 @@
LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1" LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
#item="gfxcardstatus" # enter the software to install (if it has a label in future version of Installomator) item="gfxcardstatus" # enter the software to install (if it has a label in future version of Installomator)
# Label variables below # Label variables below
@@ -129,19 +129,19 @@ dialogUpdate() {
fi fi
} }
checkCmdOutput () { checkCmdOutput () {
# $1: cmdOutput local checkOutput="$1"
local cmdOutput="$1" exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
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 if [[ ${exitStatus} -eq 0 ]] ; then
echo "${item} succesfully installed." echo "${item} succesfully installed."
selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )" selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
echo "$selectedOutput" echo "$selectedOutput"
else else
echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "ERROR installing ${item}. Exit code ${exitStatus}"
echo "$cmdOutput" echo "$checkOutput"
#errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
#echo "$errorOutput" #echo "$errorOutput"
fi fi
#echo "$checkOutput"
} }
# Check the currently logged in user # Check the currently logged in user
@@ -295,7 +295,7 @@ fi
# Install software using Installomator with valuesfromarguments # Install software using Installomator with valuesfromarguments
cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \ cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
name=${name} \ name=\"${name}\" \
type=${type} \ type=${type} \
packageID=${packageID} \ packageID=${packageID} \
downloadURL=\"$downloadURL\" \ downloadURL=\"$downloadURL\" \
@@ -304,7 +304,7 @@ cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
expectedTeamID=${expectedTeamID} \ expectedTeamID=${expectedTeamID} \
${installomatorOptions} ${installomatorNotify} || true)" ${installomatorOptions} ${installomatorNotify} || true)"
checkCmdOutput $cmdOutput checkCmdOutput "${cmdOutput}"
# Mark: dockutil stuff # Mark: dockutil stuff
if [[ $addToDock -eq 1 ]]; then if [[ $addToDock -eq 1 ]]; then
@@ -323,9 +323,7 @@ else
fi fi
# Mark: Ending # Mark: Ending
if [[ $installomatorVersion -lt 10 ]]; then if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
echo "Again skipping Dialog stuff."
else
# close and quit dialog # close and quit dialog
dialogUpdate "progress: complete" dialogUpdate "progress: complete"
dialogUpdate "progresstext: Done" dialogUpdate "progresstext: Done"

29
MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh
View File

@@ -5,15 +5,14 @@
LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1" LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
#item="" # enter the software to install (if it has a label in future version of Installomator) item="clickshare" # enter the software to install (if it has a label in future version of Installomator)
# Variables for label # Variables for label
name="ClickShare" name="ClickShare" # Spaces in the name will not work
type="appInDmgInZip" type="appInDmgInZip"
packageID="" packageID=""
downloadURL="https://www.barco.com$( curl -fs "https://www.barco.com/en/clickshare/app" | grep -A6 -i "macos" | grep -i "FileNumber" | tr '"' "\n" | grep -i "FileNumber" )" downloadURL="https://www.barco.com$( curl -fs "https://www.barco.com/en/clickshare/app" | grep -A6 -i "macos" | grep -i "FileNumber" | tr '"' "\n" | grep -i "FileNumber" )"
appNewVersion="$(eval "$( echo $downloadURL | sed -E 's/.*(MajorVersion.*BuildVersion=[0-9]*).*/\1/' | sed 's/&amp//g' )" ; ((MajorVersion++)) ; ((MajorVersion--)); ((MinorVersion++)) ; ((MinorVersion--)); ((PatchVersion++)) ; ((PatchVersion--)); ((BuildVersion++)) ; ((BuildVersion--)); echo "${MajorVersion}.${MinorVersion}.${PatchVersion}-b${BuildVersion}")" appNewVersion="$(eval "$( echo $downloadURL | sed -E 's/.*(MajorVersion.*BuildVersion=[0-9]*).*/\1/' | sed 's/&amp//g' )" ; ((MajorVersion++)) ; ((MajorVersion--)); ((MinorVersion++)) ; ((MinorVersion--)); ((PatchVersion++)) ; ((PatchVersion--)); ((BuildVersion++)) ; ((BuildVersion--)); echo "${MajorVersion}.${MinorVersion}.${PatchVersion}-b${BuildVersion}")"
versionKey=""
expectedTeamID="P6CDJZR997" expectedTeamID="P6CDJZR997"
# Dialog icon # Dialog icon
@@ -66,6 +65,10 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin
echo "$(date +%F\ %T) [LOG-BEGIN] $item" echo "$(date +%F\ %T) [LOG-BEGIN] $item"
if [[ -z "$item" ]]; then
item="$name"
fi
dialogUpdate() { dialogUpdate() {
# $1: dialog command # $1: dialog command
local dcommand="$1" local dcommand="$1"
@@ -76,24 +79,24 @@ dialogUpdate() {
fi fi
} }
checkCmdOutput () { checkCmdOutput () {
# $1: cmdOutput local checkOutput="$1"
local cmdOutput="$1" exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
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 if [[ ${exitStatus} -eq 0 ]] ; then
echo "${item} succesfully installed." echo "${item} succesfully installed."
selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )" selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
echo "$selectedOutput" echo "$selectedOutput"
else else
echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "ERROR installing ${item}. Exit code ${exitStatus}"
echo "$cmdOutput" echo "$checkOutput"
#errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
#echo "$errorOutput" #echo "$errorOutput"
fi fi
#echo "$checkOutput"
} }
# Check the currently logged in user # Check the currently logged in user
currentUser=$(stat -f "%Su" /dev/console) currentUser=$(stat -f "%Su" /dev/console)
if [ -z "$currentUser" ] || [ "$currentUser" = "loginwindow" ] || [ "$currentUser" = "_mbsetupuser" ] || [ "$currentUser" = "root" ]; then if [[ -z "$currentUser" ]] || [[ "$currentUser" = "loginwindow" ]] || [[ "$currentUser" = "_mbsetupuser" ]] || [[ "$currentUser" = "root" ]]; then
echo "ERROR. Logged in user is $currentUser! Cannot proceed." echo "ERROR. Logged in user is $currentUser! Cannot proceed."
exit 97 exit 97
fi fi
@@ -251,7 +254,7 @@ cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
expectedTeamID=${expectedTeamID} \ expectedTeamID=${expectedTeamID} \
${installomatorOptions} ${installomatorNotify} || true)" ${installomatorOptions} ${installomatorNotify} || true)"
checkCmdOutput $cmdOutput checkCmdOutput "${cmdOutput}"
# Mark: dockutil stuff # Mark: dockutil stuff
if [[ $addToDock -eq 1 ]]; then if [[ $addToDock -eq 1 ]]; then
@@ -270,9 +273,7 @@ else
fi fi
# Mark: Ending # Mark: Ending
if [[ $installomatorVersion -lt 10 ]]; then if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
echo "Again skipping Dialog stuff."
else
# close and quit dialog # close and quit dialog
dialogUpdate "progress: complete" dialogUpdate "progress: complete"
dialogUpdate "progresstext: Done" dialogUpdate "progresstext: Done"

18
MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh
View File

@@ -67,19 +67,19 @@ dialogUpdate() {
fi fi
} }
checkCmdOutput () { checkCmdOutput () {
# $1: cmdOutput local checkOutput="$1"
local cmdOutput="$1" exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
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 if [[ ${exitStatus} -eq 0 ]] ; then
echo "${item} succesfully installed." echo "${item} succesfully installed."
selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )" selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
echo "$selectedOutput" echo "$selectedOutput"
else else
echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "ERROR installing ${item}. Exit code ${exitStatus}"
echo "$cmdOutput" echo "$checkOutput"
#errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
#echo "$errorOutput" #echo "$errorOutput"
fi fi
#echo "$checkOutput"
} }
# Check the currently logged in user # Check the currently logged in user
@@ -233,7 +233,7 @@ fi
# Install software using Installomator # Install software using Installomator
cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)" cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)"
checkCmdOutput $cmdOutput checkCmdOutput "${cmdOutput}"
# Mark: dockutil stuff # Mark: dockutil stuff
if [[ $addToDock -eq 1 ]]; then if [[ $addToDock -eq 1 ]]; then
@@ -252,9 +252,7 @@ else
fi fi
# Mark: Ending # Mark: Ending
if [[ $installomatorVersion -lt 10 ]]; then if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
echo "Again skipping Dialog stuff."
else
# close and quit dialog # close and quit dialog
dialogUpdate "progress: complete" dialogUpdate "progress: complete"
dialogUpdate "progresstext: Done" dialogUpdate "progresstext: Done"

18
MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh
View File

@@ -67,19 +67,19 @@ dialogUpdate() {
fi fi
} }
checkCmdOutput () { checkCmdOutput () {
# $1: cmdOutput local checkOutput="$1"
local cmdOutput="$1" exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
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 if [[ ${exitStatus} -eq 0 ]] ; then
echo "${item} succesfully installed." echo "${item} succesfully installed."
selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )" selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
echo "$selectedOutput" echo "$selectedOutput"
else else
echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "ERROR installing ${item}. Exit code ${exitStatus}"
echo "$cmdOutput" echo "$checkOutput"
#errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
#echo "$errorOutput" #echo "$errorOutput"
fi fi
#echo "$checkOutput"
} }
# Check the currently logged in user # Check the currently logged in user
@@ -233,7 +233,7 @@ fi
# Install software using Installomator # Install software using Installomator
cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)" cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)"
checkCmdOutput $cmdOutput checkCmdOutput "${cmdOutput}"
# Mark: dockutil stuff # Mark: dockutil stuff
if [[ $addToDock -eq 1 ]]; then if [[ $addToDock -eq 1 ]]; then
@@ -255,9 +255,7 @@ else
fi fi
# Mark: Ending # Mark: Ending
if [[ $installomatorVersion -lt 10 ]]; then if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
echo "Again skipping Dialog stuff."
else
# close and quit dialog # close and quit dialog
dialogUpdate "progress: complete" dialogUpdate "progress: complete"
dialogUpdate "progresstext: Done" dialogUpdate "progresstext: Done"

18
MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
View File

@@ -64,19 +64,19 @@ dialogUpdate() {
fi fi
} }
checkCmdOutput () { checkCmdOutput () {
# $1: cmdOutput local checkOutput="$1"
local cmdOutput="$1" exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
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 if [[ ${exitStatus} -eq 0 ]] ; then
echo "${item} succesfully installed." echo "${item} succesfully installed."
selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )" selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
echo "$selectedOutput" echo "$selectedOutput"
else else
echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "ERROR installing ${item}. Exit code ${exitStatus}"
echo "$cmdOutput" echo "$checkOutput"
#errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
#echo "$errorOutput" #echo "$errorOutput"
fi fi
#echo "$checkOutput"
} }
# Check the currently logged in user # Check the currently logged in user
@@ -230,7 +230,7 @@ fi
# Install software using Installomator # Install software using Installomator
cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)" cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)"
checkCmdOutput $cmdOutput checkCmdOutput "${cmdOutput}"
# Mark: dockutil stuff # Mark: dockutil stuff
if [[ $addToDock -eq 1 ]]; then if [[ $addToDock -eq 1 ]]; then
@@ -249,9 +249,7 @@ else
fi fi
# Mark: Ending # Mark: Ending
if [[ $installomatorVersion -lt 10 ]]; then if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
echo "Again skipping Dialog stuff."
else
# close and quit dialog # close and quit dialog
dialogUpdate "progress: complete" dialogUpdate "progress: complete"
dialogUpdate "progresstext: Done" dialogUpdate "progresstext: Done"

18
MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
View File

@@ -67,19 +67,19 @@ dialogUpdate() {
fi fi
} }
checkCmdOutput () { checkCmdOutput () {
# $1: cmdOutput local checkOutput="$1"
local cmdOutput="$1" exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
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 if [[ ${exitStatus} -eq 0 ]] ; then
echo "${item} succesfully installed." echo "${item} succesfully installed."
selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )" selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
echo "$selectedOutput" echo "$selectedOutput"
else else
echo "ERROR installing ${item}. Exit code ${exitStatus}" echo "ERROR installing ${item}. Exit code ${exitStatus}"
echo "$cmdOutput" echo "$checkOutput"
#errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
#echo "$errorOutput" #echo "$errorOutput"
fi fi
#echo "$checkOutput"
} }
# Check the currently logged in user # Check the currently logged in user
@@ -233,7 +233,7 @@ fi
# Install software using Installomator # Install software using Installomator
cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)" cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)"
checkCmdOutput $cmdOutput checkCmdOutput "${cmdOutput}"
# Mark: dockutil stuff # Mark: dockutil stuff
if [[ $addToDock -eq 1 ]]; then if [[ $addToDock -eq 1 ]]; then
@@ -252,9 +252,7 @@ else
fi fi
# Mark: Ending # Mark: Ending
if [[ $installomatorVersion -lt 10 ]]; then if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
echo "Again skipping Dialog stuff."
else
# close and quit dialog # close and quit dialog
dialogUpdate "progress: complete" dialogUpdate "progress: complete"
dialogUpdate "progresstext: Done" dialogUpdate "progresstext: Done"