mirror of
https://github.com/mtan93/Installomator.git
synced 2026-03-08 21:02:46 +00:00
Variables cleaning
This commit is contained in:
@@ -1,11 +1,11 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Installomator 1st installation with DEPNotify window (auto installation at enrollment)
|
# Installomator 1st installation with DEPNotify window (auto installation at enrollment)
|
||||||
instance="Instance" # Name of used instance
|
instance="" # Name of used instance
|
||||||
|
|
||||||
LOGO="mosyleb" # "appstore", "jamf", "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
|
LOGO="" # "appstore", "jamf", "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
|
||||||
|
|
||||||
what=(dialog dockutil microsoftautoupdate supportapp applenyfonts applesfpro applesfmono applesfcompact xink zohoworkdrivetruesync textmate 1password7 wwdc theunarchiver keka microsoftedge microsoftteams microsoftonedrive microsoftoffice365)
|
items=(dialog dockutil microsoftautoupdate supportapp applenyfonts applesfpro applesfmono applesfcompact xink zohoworkdrivetruesync textmate 1password7 wwdc theunarchiver keka microsoftedge microsoftteams microsoftonedrive microsoftoffice365)
|
||||||
# Remember: dialog dockutil
|
# Remember: dialog dockutil
|
||||||
|
|
||||||
installomatorOptions="NOTIFY=silent BLOCKING_PROCESS_ACTION=ignore INSTALL=force IGNORE_APP_STORE_APPS=yes LOGGING=REQ"
|
installomatorOptions="NOTIFY=silent BLOCKING_PROCESS_ACTION=ignore INSTALL=force IGNORE_APP_STORE_APPS=yes LOGGING=REQ"
|
||||||
@@ -119,7 +119,7 @@ DEPNOTIFY_LOG="/var/tmp/depnotify.log"
|
|||||||
|
|
||||||
# Counters
|
# Counters
|
||||||
errorCount=0
|
errorCount=0
|
||||||
countLabels=${#what[@]}
|
countLabels=${#items[@]}
|
||||||
printlog "Total installations: $countLabels"
|
printlog "Total installations: $countLabels"
|
||||||
|
|
||||||
# Using LOGO variable to specify MDM and shown logo
|
# Using LOGO variable to specify MDM and shown logo
|
||||||
@@ -301,7 +301,7 @@ printlog "$countLabels labels to install"
|
|||||||
|
|
||||||
startDEPNotify
|
startDEPNotify
|
||||||
|
|
||||||
for item in "${what[@]}"; do
|
for item in "${items[@]}"; do
|
||||||
# Check if DEPNotify is running and try open it if not
|
# Check if DEPNotify is running and try open it if not
|
||||||
if ! pgrep -xq "DEPNotify"; then
|
if ! pgrep -xq "DEPNotify"; then
|
||||||
startDEPNotify
|
startDEPNotify
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Installomator 1st installation (auto installation at enrollment)
|
# Installomator 1st installation (auto installation at enrollment)
|
||||||
instance="Instance" # Name of used instance
|
instance="" # Name of used instance
|
||||||
|
|
||||||
LOGO="mosyleb" # "appstore", "jamf", "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
|
LOGO="" # "appstore", "jamf", "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
|
||||||
|
|
||||||
what=(dialog dockutil microsoftautoupdate supportapp xink zohoworkdrivetruesync textmate applenyfonts applesfpro applesfmono applesfcompact 1password7 wwdc theunarchiver keka microsoftedge microsoftteams microsoftonedrive microsoftoffice365)
|
items=(dialog dockutil microsoftautoupdate supportapp xink zohoworkdrivetruesync textmate applenyfonts applesfpro applesfmono applesfcompact 1password7 wwdc theunarchiver keka microsoftedge microsoftteams microsoftonedrive microsoftoffice365)
|
||||||
# Remember: dialog dockutil
|
# Remember: dialog dockutil
|
||||||
|
|
||||||
installomatorOptions="NOTIFY=silent BLOCKING_PROCESS_ACTION=ignore INSTALL=force IGNORE_APP_STORE_APPS=yes LOGGING=REQ"
|
installomatorOptions="NOTIFY=silent BLOCKING_PROCESS_ACTION=ignore INSTALL=force IGNORE_APP_STORE_APPS=yes LOGGING=REQ"
|
||||||
@@ -111,7 +111,7 @@ caffexit () {
|
|||||||
|
|
||||||
# Counters
|
# Counters
|
||||||
errorCount=0
|
errorCount=0
|
||||||
countLabels=${#what[@]}
|
countLabels=${#items[@]}
|
||||||
printlog "Total installations: $countLabels"
|
printlog "Total installations: $countLabels"
|
||||||
|
|
||||||
# Using LOGO variable to specify MDM and shown logo
|
# Using LOGO variable to specify MDM and shown logo
|
||||||
@@ -264,7 +264,7 @@ errorLabels=""
|
|||||||
((countLabels--))
|
((countLabels--))
|
||||||
printlog "$countLabels labels to install"
|
printlog "$countLabels labels to install"
|
||||||
|
|
||||||
for item in "${what[@]}"; do
|
for item in "${items[@]}"; do
|
||||||
printlog "$item"
|
printlog "$item"
|
||||||
cmdOutput="$( ${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true )"
|
cmdOutput="$( ${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true )"
|
||||||
exitStatus="$( echo "${cmdOutput}" | 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 )"
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Installomator 1st installation with DEPNotify window (for self Service deployment)
|
# Installomator 1st installation with DEPNotify window (for self Service deployment)
|
||||||
instance="Instance" # Name of used instance
|
instance="" # Name of used instance
|
||||||
|
|
||||||
LOGO="mosyleb" # "appstore", "jamf", "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
|
LOGO="" # "appstore", "jamf", "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
|
||||||
|
|
||||||
what=(dialog dockutil microsoftautoupdate supportapp applenyfonts applesfpro applesfmono applesfcompact xink zohoworkdrivetruesync textmate 1password7 wwdc theunarchiver keka microsoftedge microsoftteams microsoftonedrive microsoftoffice365)
|
items=(dialog dockutil microsoftautoupdate supportapp applenyfonts applesfpro applesfmono applesfcompact xink zohoworkdrivetruesync textmate 1password7 wwdc theunarchiver keka microsoftedge microsoftteams microsoftonedrive microsoftoffice365)
|
||||||
# Remember: dialog dockutil
|
# Remember: dialog dockutil
|
||||||
|
|
||||||
installomatorOptions="NOTIFY=all BLOCKING_PROCESS_ACTION=prompt_user"
|
installomatorOptions="NOTIFY=all BLOCKING_PROCESS_ACTION=prompt_user"
|
||||||
@@ -119,7 +119,7 @@ DEPNOTIFY_LOG="/var/tmp/depnotify.log"
|
|||||||
|
|
||||||
# Counters
|
# Counters
|
||||||
errorCount=0
|
errorCount=0
|
||||||
countLabels=${#what[@]}
|
countLabels=${#items[@]}
|
||||||
printlog "Total installations: $countLabels"
|
printlog "Total installations: $countLabels"
|
||||||
|
|
||||||
# Using LOGO variable to specify MDM and shown logo
|
# Using LOGO variable to specify MDM and shown logo
|
||||||
@@ -301,7 +301,7 @@ printlog "$countLabels labels to install"
|
|||||||
|
|
||||||
startDEPNotify
|
startDEPNotify
|
||||||
|
|
||||||
for item in "${what[@]}"; do
|
for item in "${items[@]}"; do
|
||||||
# Check if DEPNotify is running and try open it if not
|
# Check if DEPNotify is running and try open it if not
|
||||||
if ! pgrep -xq "DEPNotify"; then
|
if ! pgrep -xq "DEPNotify"; then
|
||||||
startDEPNotify
|
startDEPNotify
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Installomator 1st installation (for Self Service deployment)
|
# Installomator 1st installation (for Self Service deployment)
|
||||||
instance="Instance" # Name of used instance
|
instance="" # Name of used instance
|
||||||
|
|
||||||
LOGO="mosyleb" # "appstore", "jamf", "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
|
LOGO="" # "appstore", "jamf", "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
|
||||||
|
|
||||||
what=(dialog dockutil microsoftautoupdate supportapp applenyfonts applesfpro applesfmono applesfcompact xink zohoworkdrivetruesync textmate 1password7 wwdc theunarchiver keka microsoftedge microsoftteams microsoftonedrive microsoftoffice365)
|
items=(dialog dockutil microsoftautoupdate supportapp applenyfonts applesfpro applesfmono applesfcompact xink zohoworkdrivetruesync textmate 1password7 wwdc theunarchiver keka microsoftedge microsoftteams microsoftonedrive microsoftoffice365)
|
||||||
# Remember: dialog dockutil
|
# Remember: dialog dockutil
|
||||||
|
|
||||||
installomatorOptions="NOTIFY=all BLOCKING_PROCESS_ACTION=prompt_user"
|
installomatorOptions="NOTIFY=all BLOCKING_PROCESS_ACTION=prompt_user"
|
||||||
@@ -110,7 +110,7 @@ caffexit () {
|
|||||||
|
|
||||||
# Counters
|
# Counters
|
||||||
errorCount=0
|
errorCount=0
|
||||||
countLabels=${#what[@]}
|
countLabels=${#items[@]}
|
||||||
printlog "Total installations: $countLabels"
|
printlog "Total installations: $countLabels"
|
||||||
|
|
||||||
# Using LOGO variable to specify MDM and shown logo
|
# Using LOGO variable to specify MDM and shown logo
|
||||||
@@ -263,7 +263,7 @@ errorLabels=""
|
|||||||
((countLabels--))
|
((countLabels--))
|
||||||
printlog "$countLabels labels to install"
|
printlog "$countLabels labels to install"
|
||||||
|
|
||||||
for item in "${what[@]}"; do
|
for item in "${items[@]}"; do
|
||||||
printlog "$item"
|
printlog "$item"
|
||||||
cmdOutput="$( ${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true )"
|
cmdOutput="$( ${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true )"
|
||||||
exitStatus="$( echo "${cmdOutput}" | 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 )"
|
||||||
|
|||||||
Reference in New Issue
Block a user