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

updated search pattern to list labels

Browse Source
This commit is contained in:
Armin Briegel
2020-07-22 16:23:42 +02:00
parent 4c23c453b0
commit 9e42ec21f2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Installomator.sh
View File

@@ -160,7 +160,7 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
printlog "################## Start Installomator" printlog "################## Start Installomator"
# check minimal macOS requirement # MARK: check minimal macOS requirement
autoload is-at-least autoload is-at-least
if ! is-at-least 10.14 $(sw_vers -productVersion); then if ! is-at-least 10.14 $(sw_vers -productVersion); then
@@ -168,10 +168,10 @@ if ! is-at-least 10.14 $(sw_vers -productVersion); then
exit 98 exit 98
fi fi
# get the label # MARK: get the label
if [[ $# -eq 0 ]]; then if [[ $# -eq 0 ]]; then
printlog "no label provided. Printing labels:" printlog "no label provided. Printing labels:"
grep -E '^[a-z0-9]*\)$' "$0" | tr -d ')' | grep -v -E '^broken' | sort grep -E '^[a-z0-9\-]*(\)|\|\\)$' "$0" | tr -d ')|\' | grep -v -E '^broken' | grep -v -E '^(longversion|version)$' | sort
exit 0 exit 0
elif [[ $# -gt 3 ]]; then elif [[ $# -gt 3 ]]; then
# jamf uses $4 for the first custom parameter # jamf uses $4 for the first custom parameter
@@ -190,7 +190,7 @@ label=${label:l}
currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }') currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }')
# labels in case statement # MARK: labels in case statement
case $label in case $label in
version) version)
# print the script VERSION # print the script VERSION
@@ -204,7 +204,7 @@ longversion)
;; ;;
# label descriptions start here # label descriptions start here
autodmg) autodmg)
# credit: Mischa van der Bent (@mischavdbent) # credit: Mischa van der Bent (@mischavdbent)
name="AutoDMG" name="AutoDMG"
type="dmg" type="dmg"
@@ -596,7 +596,8 @@ jamfreenroller)
downloadURL=$(downloadURLFromGit jamf ReEnroller) downloadURL=$(downloadURLFromGit jamf ReEnroller)
expectedTeamID="PS2F6S478M" expectedTeamID="PS2F6S478M"
;; ;;
adobereaderdc|adobereaderdc-install) adobereaderdc|\
adobereaderdc-install)
name="Adobe Acrobat Reader DC" name="Adobe Acrobat Reader DC"
type="pkgInDmg" type="pkgInDmg"
downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\\]",' | head -n 1 | cut -d \" -f 4) downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\\]",' | head -n 1 | cut -d \" -f 4)