diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c6df07..4ced6ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+- Change in finding installed apps. We now look in /Applications and /Applications/Utilities first. If not found there, we use spotligt to find it. (We discovered a problem when a user has Parallels Windows installed with Microsoft Edge in it. Then Installomator wanted to update the app all the time, becaus spotligt found that Windows version of the app that Parallels created.)
+- Added bunch of new labels
+- Improved `buildCaseStatement.sh` a lot. It is a great start when figuring out how to create a new label for an app, or a piece of software.
+- Mosyle changed their app name from Business to Self-Service
+
## v0.5 - 2021-04-13
- Major update and now with help from @Theile and @Isaac
diff --git a/Installomator.sh b/Installomator.sh
index 227ff80..bad2dee 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -3,15 +3,21 @@ label="" # if no label is sent to the script, this will be used
# Installomator
#
-# Downloads and installs an Applications
-# 2020 Armin Briegel - Scripting OS X
+# Downloads and installs Applications
+# 2020-2021 Installomator
#
# inspired by the download scripts from William Smith and Sander Schram
-# with additional ideas and contribution from Isaac Ordonez, Mann consulting
-# and help from Søren Theilgaard (theilgaard.dk)
+#
+# Contributers:
+# Armin Briegel - @scriptingosx
+# Isaac Ordonez - @issacatmann
+# Søren Theilgaard - @Theile
+# Adam Codega - @acodega
+#
+# with contributions from many others
VERSION='0.6.0'
-VERSIONDATE='2021-04-20'
+VERSIONDATE='2021-07-14'
export PATH=/usr/bin:/bin:/usr/sbin:/sbin
@@ -34,6 +40,9 @@ NOTIFY=success
BLOCKING_PROCESS_ACTION=prompt_user
# options:
# - ignore continue even when blocking processes are found
+# - quit app will be told to quit nicely, if running
+# - quit_kill told to quit twice, then it will be killed
+# Could be great for service apps, if they do not respawn
# - silent_fail exit script without prompt or installation
# - prompt_user show a user dialog for each blocking process found
# abort after three attempts to quit
@@ -61,6 +70,7 @@ LOGO=appstore
# - jamf JAMF Pro
# - mosyleb Mosyle Business
# - mosylem Mosyle Manager (Education)
+# - addigy Addigy
# path can also be set in the command call, and if file exists, it will be used, like 'LOGO="/System/Applications/App\ Store.app/Contents/Resources/AppIcon.icns"' (spaces are escaped).
@@ -114,6 +124,18 @@ REOPEN="yes"
# If given, it will be compared to installed version, to see if download is different.
# It does not check for newer or not, only different.
#
+# - versionKey: (optional)
+# How we get version number from app. Possible values:
+# - CFBundleShortVersionString
+# - CFBundleVersion
+# Not all software titles uses fields the same.
+# See Opera label.
+#
+# - appCustomVersion(){}: (optional function)
+# This function can be added to your label, if a specific custom
+# mechanism hs to be used for getting the installed version.
+# See labels zulujdk11, zulujdk13, zulujdk15
+#
# - expectedTeamID: (required)
# 10-digit developer team ID.
# Obtain the team ID by running:
@@ -304,7 +326,15 @@ xpath() {
getAppVersion() {
- # modified by: Søren Theilgaard (@theilgaard)
+ # modified by: Søren Theilgaard (@theilgaard) and Isaac Ordonez
+
+ # If label contain function appCustomVersion, we use that and return
+ if type 'appCustomVersion' 2>/dev/null | grep -q 'function'; then
+ appversion=$(appCustomVersion)
+ printlog "Custom App Version detection is used, found $appversion"
+ return
+ fi
+
# pkgs contains a version number, then we don't have to search for an app
if [[ $packageID != "" ]]; then
appversion="$(pkgutil --pkg-info-plist ${packageID} 2>/dev/null | grep -A 1 pkg-version | tail -1 | sed -E 's/.*>([0-9.]*)<.*/\1/g')"
@@ -316,15 +346,16 @@ getAppVersion() {
fi
fi
- # get all apps matching name
- applist=$(mdfind "kind:application $appName" -0 )
- if [[ $applist = "" ]]; then
- printlog "Spotlight not returning any app, trying manually in /Applications."
- if [[ -d "/Applications/$appName" ]]; then
- applist="/Applications/$appName"
- fi
+ # get app in /Applications, or /Applications/Utilities, or find using Spotlight
+ if [[ -d "/Applications/$appName" ]]; then
+ applist="/Applications/$appName"
+ elif [[ -d "/Applications/Utilities/$appName" ]]; then
+ applist="/Applications/Utilities/$appName"
+ else
+ applist=$(mdfind "kind:application $appName" -0 )
fi
-
+ printlog "App(s) found: ${applist}"
+
appPathArray=( ${(0)applist} )
if [[ ${#appPathArray} -gt 0 ]]; then
@@ -332,7 +363,7 @@ getAppVersion() {
if [[ ${#filteredAppPaths} -eq 1 ]]; then
installedAppPath=$filteredAppPaths[1]
#appversion=$(mdls -name kMDItemVersion -raw $installedAppPath )
- appversion=$(defaults read $installedAppPath/Contents/Info.plist CFBundleShortVersionString) #Not dependant on Spotlight indexing
+ appversion=$(defaults read $installedAppPath/Contents/Info.plist $versionKey) #Not dependant on Spotlight indexing
printlog "found app at $installedAppPath, version $appversion"
else
printlog "could not determine location of $appName"
@@ -358,6 +389,18 @@ checkRunningProcesses() {
appClosed=1
case $BLOCKING_PROCESS_ACTION in
+ quit|quit_kill)
+ printlog "telling app $x to quit"
+ runAsUser osascript -e "tell app \"$x\" to quit"
+ if [[ $i > 2 && $BLOCKING_PROCESS_ACTION = "quit_kill" ]]; then
+ printlog "Changing BLOCKING_PROCESS_ACTION to kill"
+ BLOCKING_PROCESS_ACTION=kill
+ else
+ # give the user a bit of time to quit apps
+ printlog "waiting 30 seconds for processes to quit"
+ sleep 30
+ fi
+ ;;
kill)
printlog "killing process $x"
pkill $x
@@ -480,7 +523,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
# versioncheck
# credit: Søren Theilgaard (@theilgaard)
- appNewVersion=$(defaults read $appPath/Contents/Info.plist CFBundleShortVersionString)
+ appNewVersion=$(defaults read $appPath/Contents/Info.plist $versionKey)
if [[ $appversion == $appNewVersion ]]; then
printlog "Downloaded version of $name is $appNewVersion, same as installed."
if [[ $INSTALL != "force" ]]; then
@@ -797,6 +840,10 @@ label=${label:l}
printlog "################## Start Installomator v. $VERSION"
printlog "################## $label"
+# How we get version number from app
+# (alternative is "CFBundleVersion", that can be used in labels)
+versionKey="CFBundleShortVersionString"
+
# get current user
currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }')
@@ -823,7 +870,14 @@ longversion)
expectedTeamID="2BUA8C4S2C"
blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" )
#forcefulQuit=YES
- #Company="Agilebits"
+ ;;
+4kvideodownloader)
+ name="4K Video Downloader"
+ type="dmg"
+ downloadURL="$(curl -fsL "https://www.4kdownload.com/products/product-videodownloader" | grep -E -o "https:\/\/dl\.4kdownload\.com\/app\/4kvideodownloader_.*?.dmg\?source=website" | head -1)"
+ appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*\/[0-9a-zA-Z]*_([0-9.]*)\.dmg.*/\1/g')
+ versionKey="CFBundleVersion"
+ expectedTeamID="GHQ37VJF83"
;;
8x8)
# credit: #D-A-James from MacAdmins Slack and Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -833,7 +887,6 @@ longversion)
# As for appNewVersion, it needs to be checked for newer version than 7.2.4
appNewVersion=$(curl -fs -L https://support.8x8.com/cloud-phone-service/voice/work-desktop/download-8x8-work-for-desktop | grep -m 1 -o "https.*dmg" | sed 's/\"//' | awk '{print $1}' | sed -E 's/.*-v([0-9\.]*)[-\.]*.*/\1/' )
expectedTeamID="FC967L3QRG"
- #Company="8x8"
;;
abstract)
name="Abstract"
@@ -841,10 +894,8 @@ abstract)
downloadURL="https://api.goabstract.com/releases/latest/download"
appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
expectedTeamID="77MZLZE47D"
- #Company="Elastic Projects, Inc"
;;
adobebrackets)
- # credit: Adrian Bühler (@midni9ht)
name="Brackets"
type="dmg"
downloadURL=$(downloadURLFromGit adobe brackets )
@@ -871,9 +922,6 @@ adobereaderdc-install)
#appNewVersion=$(curl -s -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" https://get.adobe.com/reader/ | grep ">Version" | sed -E 's/.*Version 20([0-9.]*)<.*/\1/g') # credit: Søren Theilgaard (@theilgaard)
expectedTeamID="JQ525L2MZD"
blockingProcesses=( "AdobeReader" )
- #Company="Adobe"
- #PatchName="AcrobatReader"
- #PatchSkip="YES"
;;
adobereaderdc-update)
name="Adobe Acrobat Reader DC"
@@ -898,7 +946,13 @@ airserver)
downloadURL="https://www.airserver.com/download/mac/latest"
#appNewVersion=$() # Cannot find version history or release notes on home page
expectedTeamID="6C755KS5W3"
- #Company="App Dynamic ehf"
+ ;;
+aldente)
+ name="AlDente"
+ type="dmg"
+ downloadURL=$(downloadURLFromGit davidwernhart AlDente)
+ appNewVersion=$(versionFromGit davidwernhart AlDente)
+ expectedTeamID="3WVC84GB99"
;;
alfred)
# credit: AP Orlebeke (@apizz)
@@ -908,7 +962,13 @@ alfred)
appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*Alfred_([0-9.]*)_.*/\1/')
appName="Alfred 4.app"
expectedTeamID="XZZXE9SED4"
- #Company="Running with Crayons Ltd"
+ ;;
+alttab)
+ # credit: Gabe Marchan (gabemarchan.com - @darklink87)
+ name="AltTab"
+ type="zip"
+ downloadURL=$(downloadURLFromGit lwouis alt-tab-macos)
+ expectedTeamID="QXD7GW8FHY"
;;
amazonchime)
# credit: @dvsjr macadmins slack
@@ -917,7 +977,6 @@ amazonchime)
downloadURL="https://clients.chime.aws/mac/latest"
appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z.\-]*-([0-9.]*)\..*/\1/g' )
expectedTeamID="94KV3E626L"
- #Company="Amazon"
;;
amazonworkspaces)
# credit: Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -934,12 +993,18 @@ androidfiletransfer)
downloadURL="https://dl.google.com/dl/androidjumper/mtp/current/AndroidFileTransfer.dmg"
expectedTeamID="EQHXZ8M8AV"
;;
+anydesk)
+ name="AnyDesk"
+ type="dmg"
+ downloadURL="https://download.anydesk.com/anydesk.dmg"
+ appNewVersion="$(curl -fs https://anydesk.com/da/downloads/mac-os | grep -i "d-block" | grep -E -o ">v[0-9.]* .*MB" | sed -E 's/.*v([0-9.]*) .*/\1/g')"
+ expectedTeamID="KU6W3B6JMZ"
+ ;;
apparency)
name="Apparency"
type="dmg"
downloadURL="https://www.mothersruin.com/software/downloads/Apparency.dmg"
expectedTeamID="936EB786NH"
- #Company="Mother's Ruin Graphics"
;;
appcleaner)
# credit: Tadayuki Onishi (@kenchan0130)
@@ -947,7 +1012,34 @@ appcleaner)
type="zip"
downloadURL=$(curl -fs https://freemacsoft.net/appcleaner/Updates.xml | xpath '//rss/channel/*/enclosure/@url' 2>/dev/null | tr " " "\n" | sort | tail -1 | cut -d '"' -f 2)
expectedTeamID="X85ZX835W9"
- #Company=FreeMacSoft
+ ;;
+applenyfonts)
+ name="Apple New York Font Collection"
+ type="pkgInDmg"
+ downloadURL="https://devimages-cdn.apple.com/design/resources/download/NY-Font.dmg"
+ packageID="com.apple.pkg.NYFonts"
+ expectedTeamID="Development Update"
+ ;;
+applesfpro)
+ name="San Francisco Pro"
+ type="pkgInDmg"
+ downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Pro.dmg"
+ packageID="com.apple.pkg.SanFranciscoPro"
+ expectedTeamID="Development Update"
+ ;;
+applesfmono)
+ name="San Francisco Mono"
+ type="pkgInDmg"
+ downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
+ packageID="com.apple.pkg.SFMonoFonts"
+ expectedTeamID="Software Update"
+ ;;
+applesfcompact)
+ name="San Francisco Compact"
+ type="pkgInDmg"
+ downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Compact.dmg"
+ packageID="com.apple.pkg.SanFranciscoCompact"
+ expectedTeamID="Development Update"
;;
aquaskk)
# credit: Tadayuki Onishi (@kenchan0130)
@@ -956,8 +1048,21 @@ aquaskk)
downloadURL=$(downloadURLFromGit codefirst aquaskk)
appNewVersion=$(versionFromGit codefirst aquaskk)
expectedTeamID="FPZK4WRGW7"
- #Company="Code First"
- #PatchSkip="YES"
+ ;;
+arq7)
+ name="Arq7"
+ type="pkg"
+ packageID="com.haystacksoftware.Arq"
+ downloadURL="https://arqbackup.com/download/arqbackup/Arq7.pkg"
+ appNewVersion="$(curl -fs "https://arqbackup.com" | grep -io "version .*[0-9.]*.* for macOS" | cut -d ">" -f2 | cut -d "<" -f1)"
+ expectedTeamID="48ZCSDVL96"
+ ;;
+atext)
+ # credit: Gabe Marchan (gabemarchan.com - @darklink87)
+ name="aText"
+ type="dmg"
+ downloadURL="https://trankynam.com/atext/downloads/aText.dmg"
+ expectedTeamID="KHEMQ2FD9E"
;;
atom)
name="Atom"
@@ -966,7 +1071,14 @@ atom)
downloadURL=$(downloadURLFromGit atom atom )
appNewVersion=$(versionFromGit atom atom)
expectedTeamID="VEKTX9H2N7"
- #Company=GitHub
+ ;;
+audacity)
+ # credit: Gabe Marchan (gabemarchan.com - @darklink87)
+ name="Audacity"
+ type="dmg"
+ downloadURL=$(downloadURLFromGit audacity audacity)
+ appNewVersion=$(versionFromGit audacity audacity)
+ expectedTeamID="T3N4JQ7YY6"
;;
autodmg)
# credit: Mischa van der Bent (@mischavdbent)
@@ -975,7 +1087,6 @@ autodmg)
downloadURL=$(downloadURLFromGit MagerValp AutoDMG)
appNewVersion=$(versionFromGit MagerValp AutoDMG)
expectedTeamID="5KQ3D3FG5H"
- #Company=MagerValp
;;
autopkgr)
# credit: Søren Theilgaard (@theilgaard)
@@ -985,7 +1096,6 @@ autopkgr)
downloadURL=$(downloadURLFromGit lindegroup autopkgr)
appNewVersion=$(versionFromGit lindegroup autopkgr)
expectedTeamID="JVY2ZR6SEF"
- #Company="Linde Group"
;;
aviatrix)
# credit: Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -993,7 +1103,6 @@ aviatrix)
type="pkg"
downloadURL="https://s3-us-west-2.amazonaws.com/aviatrix-download/AviatrixVPNClient/AVPNC_mac.pkg"
expectedTeamID="32953Z7NBN"
- #Company=Aviatrix
;;
awscli2)
# credit: Bilal Habib (@Pro4TLZZ)
@@ -1010,16 +1119,27 @@ awsvpnclient)
downloadURL="https://d20adtppz83p9s.cloudfront.net/OSX/latest/AWS_VPN_Client.pkg"
expectedTeamID="94KV3E626L"
appNewVersion=$(curl -is "https://beta2.communitypatch.com/jamf/v1/ba1efae22ae74a9eb4e915c31fef5dd2/patch/AWSVPNClient" | grep currentVersion | tr ',' '\n' | grep currentVersion | cut -d '"' -f 4)
- #Company=Amazon
;;
balenaetcher)
- # credit: Adrian Bühler (@midni9ht)
name="balenaEtcher"
type="dmg"
downloadURL=$(downloadURLFromGit balena-io etcher )
appNewVersion=$(versionFromGit balena-io etcher )
expectedTeamID="66H43P8FRG"
- #Company="Balena"
+ ;;
+balsamiqwireframes)
+ # credit: Gabe Marchan (gabemarchan.com - @darklink87)
+ name="Balsamiq Wireframes"
+ type="dmg"
+ downloadURL=https://builds.balsamiq.com/bwd/$(curl -fs "https://builds.balsamiq.com" | awk -F "
Version" | head -1 | cut -d " " -f1 | cut -d ";" -f2 | cut -d "." -f 1-3) + expectedTeamID="S272Y5R93J" + ;; +clevershare2) + # credit: Søren Theilgaard (@theilgaard) + name="Clevershare" + type="dmg" + downloadURL=$(curl -fs https://archive.clevertouch.com/clevershare2g | grep -i "_Mac" | tr '"' "\n" | grep "^http.*dmg") + appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z-]*_Mac\.([0-9.]*)\.[0-9]*\.dmg$/\1/g' ) + expectedTeamID="P76M9BE8DQ" + ;; +clickshare) + # credit: Søren Theilgaard (@theilgaard) + name="ClickShare" + type="appInDmgInZip" + downloadURL=https://www.barco.com$(curl -fs "https://www.barco.com/en/clickshare/app" | grep -E -o '(\/\S*Download\?FileNumber=R3306192\S*ShowDownloadPage=False)' | tail -1) + expectedTeamID="P6CDJZR997" + ;; +code42) + # credit: Isaac Ordonez, Mann consulting (@mannconsulting) + name="Code42" + type="pkgInDmg" + downloadURL=https://download.code42.com/installs/agent/latest-mac.dmg + expectedTeamID="9YV9435DHD" + blockingProcesses=( NONE ) + ;; +coderunner) + # credit: Erik Stam (@erikstam) + name="CodeRunner" + type="zip" + downloadURL="https://coderunnerapp.com/download" + expectedTeamID="R4GD98AJF9" + ;; +cormorant) + # credit: Søren Theilgaard (@theilgaard) + name="Cormorant" + type="zip" + downloadURL=$(curl -fs https://eclecticlight.co/downloads/ | grep -i $name | grep zip | sed -E 's/.*href=\"(https.*)\">.*/\1/g') + appNewVersion=$(curl -fs https://eclecticlight.co/downloads/ | grep zip | grep -o -E "$name [0-9.]*" | awk '{print $2}') + expectedTeamID="QWY4LRW926" + ;; +cryptomator) + name="Cryptomator" + type="dmg" + downloadURL=$(downloadURLFromGit cryptomator cryptomator) + appNewVersion=$(versionFromGit cryptomator cryptomator) + expectedTeamID="YZQJQUHA3L" + ;; +cyberduck) + name="Cyberduck" + type="zip" + downloadURL=$(curl -fs https://version.cyberduck.io/changelog.rss | xpath '//rss/channel/item/enclosure/@url' 2>/dev/null | cut -d '"' -f 2 ) + appNewVersion=$(curl -fs https://version.cyberduck.io/changelog.rss | xpath '//rss/channel/item/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f 2 ) + expectedTeamID="G69SCX94XU" + ;; +dangerzone) + # credit: Micah Lee (@micahflee) + name="Dangerzone" + type="dmg" + downloadURL=$(curl -s https://dangerzone.rocks/ | grep https://github.com/firstlookmedia/dangerzone/releases/download | grep \.dmg | cut -d'"' -f2) + expectedTeamID="P24U45L8P5" + ;; +darktable) + # credit: Søren Theilgaard (@theilgaard) + name="darktable" + type="dmg" + downloadURL=$(downloadURLFromGit darktable-org darktable) + appNewVersion=$(versionFromGit darktable-org darktable) + expectedTeamID="85Q3K4KQRY" + ;; +dbeaverce) + name="DBeaver" + type="dmg" + downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos.dmg" + expectedTeamID="42B6MDKMW8" + blockingProcesses=( dbeaver ) + ;; +debookee) + name="Debookee" + type="zip" + downloadURL=$(curl --location --fail --silent "https://www.iwaxx.com/debookee/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2) + expectedTeamID="AATLWWB4MZ" + ;; +defaultfolderx) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="Default Folder X" + type="dmg" + downloadURL=$(curl -fs "https://www.stclairsoft.com/cgi-bin/dl.cgi?DX" | awk -F '"' "/dmg/ {print \$4}" | head -2 | tail -1) + expectedTeamID="7HK42V8R9D" + ;; +depnotify) + name="DEPNotify" + type="zip" + downloadURL="https://files.nomad.menu/DEPNotify.zip" + expectedTeamID="VRPY9KHGX6" + targetDir="/Applications/Utilities" + ;; +desktoppr) + name="desktoppr" + type="pkg" + packageID="com.scriptingosx.desktoppr" + downloadURL=$(downloadURLFromGit "scriptingosx" "desktoppr") + appNewVersion=$(versionFromGit "scriptingosx" "desktoppr") + expectedTeamID="JME5BW3F3R" + blockingProcesses=( NONE ) + ;; +detectxswift) + # credit: AP Orlebeke (@apizz) + name="DetectX Swift" + type="zip" + downloadURL="https://s3.amazonaws.com/sqwarq.com/PublicZips/DetectX_Swift.app.zip" + appNewVersion=$(curl -fs https://s3.amazonaws.com/sqwarq.com/AppCasts/dtxswift_release_notes.html | grep Version | head -1 | sed -E 's/.*Version ([0-9.]*)\<.*/\1/') + expectedTeamID="MAJ5XBJSG3" + ;; +devonthink) + # It's a zipped dmg file, needs function installAppInDmgInZip + # credit: Søren Theilgaard (@theilgaard) + name="DEVONthink 3" + type="appInDmgInZip" + downloadURL=$( curl -fs https://www.devontechnologies.com/apps/devonthink | grep -i "download.devon" | tr '"' '\n' | tr "'" '\n' | grep -e '^https://' ) + appNewVersion=$( echo ${downloadURL} | tr '/' '\n' | grep "[0-9]" | grep "[.]" | head -1 ) + expectedTeamID="679S2QUWR8" + ;; +dialpad) + # credit: @ehosaka + name="Dialpad" + type="dmg" + downloadURL="https://storage.googleapis.com/dialpad_native/osx/Dialpad.dmg" + expectedTeamID="9V29MQSZ9M" + ;; +discord) + name="Discord" + type="dmg" + downloadURL="https://discordapp.com/api/download?platform=osx" + expectedTeamID="53Q6R32WPB" + ;; +docker) + # credit: @securitygeneration + name="Docker" + type="dmg" + #downloadURL="https://download.docker.com/mac/stable/Docker.dmg" + if [[ $(arch) == arm64 ]]; then + downloadURL="https://desktop.docker.com/mac/stable/arm64/Docker.dmg" + elif [[ $(arch) == i386 ]]; then + downloadURL="https://desktop.docker.com/mac/stable/amd64/Docker.dmg" + fi + appNewVersion=$(curl -ifs https://docs.docker.com/docker-for-mac/release-notes/ | grep ">Docker Desktop Community" | head -1 | sed -n -e 's/^.*Community //p' | cut -d '<' -f1) + expectedTeamID="9BNSXJN65R" + ;; +drift) + # credit Elena Ackley (@elenaelago) + name="Drift" + type="dmg" + downloadURL="https://drift-prod-desktop-installers.s3.amazonaws.com/mac/Drift-latest.dmg" + expectedTeamID="78559WUUR9" + ;; +dropbox) + name="Dropbox" + type="dmg" + downloadURL="https://www.dropbox.com/download?plat=mac&full=1" + expectedTeamID="G7HH3F8CAK" + ;; +easeusdatarecoverywizard) + # credit: Søren Theilgaard (@theilgaard) + name="EaseUS Data Recovery Wizard" + type="dmg" + downloadURL=$( curl -fsIL https://down.easeus.com/product/mac_drw_free_setup | grep -i "^location" | awk '{print $2}' | tr -d '\r\n' ) + #appNewVersion="" + expectedTeamID="DLLVW95FSM" + ;; +egnyte) + # credit: #MoeMunyoki from MacAdmins Slack + name="Egnyte Connect" + type="pkg" + downloadURL="https://egnyte-cdn.egnyte.com/egnytedrive/mac/en-us/latest/EgnyteConnectMac.pkg" + expectedTeamID="FELUD555VC" + blockingProcesses=( NONE ) + ;; +element) + name="Element" + type="dmg" + downloadURL="https://packages.riot.im/desktop/install/macos/Element.dmg" + appNewVersion=$(versionFromGit vector-im element-desktop) + expectedTeamID="7J4U792NQT" + ;; +eraseinstall) + name="EraseInstall" + type="pkg" + downloadURL=https://bitbucket.org$(curl -fs https://bitbucket.org/prowarehouse-nl/erase-install/downloads/ | grep pkg | cut -d'"' -f2 | head -n 1) + expectedTeamID="R55HK5K86Y" + ;; +etrecheck) + # credit: @dvsjr macadmins slack + name="EtreCheckPro" + type="zip" + downloadURL="https://cdn.etrecheck.com/EtreCheckPro.zip" + expectedTeamID="U87NE528LC" + ;; +evernote) + name="Evernote" + type="dmg" + downloadURL=$(curl -fs -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" "https://evernote.com/download" | grep -i ".dmg" | cut -d '"' -f2) + appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' ) + expectedTeamID="Q79WDW8YH9" + appName="Evernote.app" + ;; +exelbanstats) + # credit: Søren Theilgaard (@theilgaard) + name="Stats" + type="dmg" + downloadURL=$(downloadURLFromGit exelban stats) + appNewVersion=$(versionFromGit exelban stats) + expectedTeamID="RP2S87B72W" + ;; +fantastical) + # credit: Drew Diver (@grumpydrew on MacAdmins Slack) + name="Fantastical" + type="zip" + downloadURL="https://flexibits.com/fantastical/download" + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*)\..*/\1/g' ) + expectedTeamID="85C27NK92C" + ;; +favro) + name="Favro" + type="dmg" + downloadURL="https://download.favro.com/FavroDesktop/macOS/x64/$(curl -fs https://download.favro.com/FavroDesktop/macOS/x64/Latest.html | cut -d ">" -f1 | cut -d "=" -f 4 | cut -d '"' -f1)" + appNewVersion="$(curl -fs https://download.favro.com/FavroDesktop/macOS/x64/Latest.html | cut -d ">" -f1 | cut -d "=" -f 4 | cut -d '"' -f1 | sed -E 's/.*-([0-9.]*)\.dmg/\1/g')" + expectedTeamID="PUA8Q354ZF" + ;; +ferdi) + name="Ferdi" + type="dmg" + downloadURL=$(downloadURLFromGit getferdi ferdi ) + appNewVersion=$(versionFromGit getferdi ferdi ) + expectedTeamID="B6J9X9DWFL" + ;; +figma) + name="Figma" + type="zip" + downloadURL="https://desktop.figma.com/mac/Figma.zip" + expectedTeamID="T8RA8NE3B7" + ;; +firefox) + name="Firefox" + type="dmg" + downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US" + appNewVersion=$(/usr/bin/curl https://www.mozilla.org/en-US/firefox/releases/ --silent | /usr/bin/grep '/dev/null | cut -d '"' -f 2) + expectedTeamID="V85GBYB7B9" + ;; +gimp) + name="GIMP-2.10" + type="dmg" + downloadURL=https://$(curl -fs https://www.gimp.org/downloads/ | grep -m 1 -o "download.*gimp-.*.dmg") + appNewVersion=$(echo $downloadURL | cut -d "-" -f 2) + expectedTeamID="T25BQ8HSJF" + ;; +githubdesktop) + name="GitHub Desktop" + type="zip" + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://central.github.com/deployments/desktop/desktop/latest/darwin-arm64" + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://central.github.com/deployments/desktop/desktop/latest/darwin" + fi + appNewVersion=$(curl -fsL https://central.github.com/deployments/desktop/desktop/changelog.json | awk -F '{' '/"version"/ { print $2 }' | sed -E 's/.*,\"version\":\"([0-9.]*)\".*/\1/g') + expectedTeamID="VEKTX9H2N7" + ;; +golang) + # credit: Søren Theilgaard (@theilgaard) + name="GoLang" + type="pkg" + packageID="org.golang.go" + downloadURL="$(curl -fsIL "https://golang.org$(curl -fs "https://golang.org/dl/" | grep -i "downloadBox" | grep "pkg" | tr '"' '\n' | grep "pkg")" | grep -i "^location" | awk '{print $2}' | tr -d '\r\n')" + appNewVersion="$( echo "${downloadURL}" | sed -E 's/.*\/(go[0-9.]*)\..*/\1/g' )" # Version includes letters "go" + expectedTeamID="EQHXZ8M8AV" + blockingProcesses=( NONE ) + ;; +googlechrome) + name="Google Chrome" + type="dmg" + if [[ $(arch) != "i386" ]]; then + printlog "Architecture: arm64 (not i386)" + downloadURL="https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg" + appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}') # Credit: William Smith (@meck) + else + printlog "Architecture: i386" + downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg" + appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac,stable/{print $3; exit}') # Credit: William Smith (@meck) + fi + expectedTeamID="EQHXZ8M8AV" + ;; +googlechromepkg) + name="Google Chrome" + type="pkg" + # + # Note: this url acknowledges that you accept the terms of service + # https://support.google.com/chrome/a/answer/9915669 + # + downloadURL="https://dl.google.com/chrome/mac/stable/accept_tos%3Dhttps%253A%252F%252Fwww.google.com%252Fintl%252Fen_ph%252Fchrome%252Fterms%252F%26_and_accept_tos%3Dhttps%253A%252F%252Fpolicies.google.com%252Fterms/googlechrome.pkg" + expectedTeamID="EQHXZ8M8AV" + updateTool="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/GoogleSoftwareUpdateAgent.app/Contents/MacOS/GoogleSoftwareUpdateAgent" + updateToolArguments=( -runMode oneshot -userInitiated YES ) + updateToolRunAsCurrentUser=1 + ;; +googleearth) + name="Google Earth Pro" + type="pkgInDmg" + downloadURL="https://dl.google.com/earth/client/advanced/current/GoogleEarthProMac-Intel.dmg" + expectedTeamID="EQHXZ8M8AV" + ;; +googledrive|\ +googledrivefilestream) + # credit: Isaac Ordonez, Mann consulting (@mannconsulting) + name="Google Drive File Stream" + type="pkgInDmg" + packageID="com.google.drivefs" + downloadURL="https://dl.google.com/drive-file-stream/GoogleDriveFileStream.dmg" # downloadURL="https://dl.google.com/drive-file-stream/GoogleDrive.dmg" + blockingProcesses=( "Google Docs" "Google Drive" "Google Sheets" "Google Slides" ) + expectedTeamID="EQHXZ8M8AV" + ;; +googledrivebackupandsync) + name="Backup and Sync" + type="dmg" + downloadURL="https://dl.google.com/drive/InstallBackupAndSync.dmg" + expectedTeamID="EQHXZ8M8AV" + ;; +googlejapaneseinput) + # credit: Tadayuki Onishi (@kenchan0130) + name="GoogleJapaneseInput" + type="pkgInDmg" + pkgName="GoogleJapaneseInput.pkg" + downloadURL="https://dl.google.com/japanese-ime/latest/GoogleJapaneseInput.dmg" + blockingProcesses=( NONE ) + expectedTeamID="EQHXZ8M8AV" + ;; +googlesoftwareupdate) + name="Install Google Software Update" + type="pkgInDmg" + pkgName="Install Google Software Update.app/Contents/Resources/GSUInstall.pkg" + downloadURL="https://dl.google.com/mac/install/googlesoftwareupdate.dmg" + blockingProcesses=( NONE ) + expectedTeamID="EQHXZ8M8AV" + ;; +gotomeeting) + # credit: @matins + name="GoToMeeting" + type="dmg" + downloadURL="https://link.gotomeeting.com/latest-dmg" + expectedTeamID="GFNFVT632V" + ;; +gpgsuite) + # credit: Micah Lee (@micahflee) + name="GPG Suite" + type="pkgInDmg" + pkgName="Install.pkg" + downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4) + expectedTeamID="PKV8ZPD836" + ;; +gpgsync) + # credit: Micah Lee (@micahflee) + name="GPG Sync" + type="pkg" + downloadURL="https://github.com$(curl -s -L https://github.com/firstlookmedia/gpgsync/releases/latest | grep /firstlookmedia/gpgsync/releases/download | grep \.pkg | cut -d'"' -f2)" + expectedTeamID="P24U45L8P5" + ;; +grandperspective) + name="GrandPerspective" + type="dmg" + downloadURL="https://sourceforge.net/projects/grandperspectiv/files/latest/download" + expectedTeamID="3Z75QZGN66" + ;; +grasshopper) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="Grasshopper" + type="dmg" + downloadURL="https://dl.grasshopper.com/Grasshopper.dmg" + pkgName="Grasshopper.dmg" + expectedTeamID="KD6L2PTK2Q" + ;; +gyazo) + # credit: @matins + name="Gyazo" + type="dmg" + appNewVersion=$(curl -is "https://formulae.brew.sh/cask/gyazo" | grep 'Current version:' | grep -o "Gyazo.*dmg" | cut -d "-" -f 2 | awk -F ".dmg" '{print $1}') + downloadURL="https://files.gyazo.com/setup/Gyazo-${appNewVersion}.dmg" + expectedTeamID="9647Y3B7A4" + ;; +gyazogif) + # credit: @matins + # This is identical to gyazo, but the download contains two apps on the DMG + name="Gyazo GIF" + type="dmg" + appNewVersion=$(curl -is "https://formulae.brew.sh/cask/gyazo" | grep 'Current version:' | grep -o "Gyazo.*dmg" | cut -d "-" -f 2 | awk -F ".dmg" '{print $1}') + downloadURL="https://files.gyazo.com/setup/Gyazo-${appNewVersion}.dmg" + expectedTeamID="9647Y3B7A4" + ;; +hancock) + # Credit: Bilal Habib @Pro4TLZZZ + name="Hancock" + type="dmg" + downloadURL=$(downloadURLFromGit JeremyAgost Hancock ) + appNewVersion=$(versionFromGit JeremyAgost Hancock ) + expectedTeamID="SWD2B88S58" + ;; +handbrake) + name="HandBrake" + type="dmg" + downloadURL=$(curl --silent --fail "https://api.github.com/repos/HandBrake/HandBrake/releases/latest" \ + | awk -F '"' "/browser_download_url/ && /dmg/ && ! /sig/ && ! /CLI/ { print \$4 }") + appNewVersion=$(curl -sf "https://api.github.com/repos/HandBrake/HandBrake/releases/latest" | awk -F '"' "/tag_name/ { print \$4 }") + expectedTeamID="5X9DE89KYV" + ;; +hazel) + # credit: Søren Theilgaard (@theilgaard) + name="Hazel" + type="dmg" + downloadURL=$(curl -fsI https://www.noodlesoft.com/Products/Hazel/download | grep -i "^location" | awk '{print $2}' | tr -d '\r\n') + appNewVersion=$(curl -fsI https://www.noodlesoft.com/Products/Hazel/download | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g') + expectedTeamID="86Z3GCJ4MF" + ;; +hpeasyadmin) + # credit: Søren Theilgaard (@theilgaard) + name="HP Easy Admin" + type="zip" + downloadURL="https://ftp.hp.com/pub/softlib/software12/HP_Quick_Start/osx/Applications/HP_Easy_Admin.app.zip" + expectedTeamID="6HB5Y2QTA3" + ;; +hpeasystart) + # credit: Søren Theilgaard (@theilgaard) + name="HP Easy Start" + type="zip" + downloadURL="https://ftp.hp.com/pub/softlib/software12/HP_Quick_Start/osx/Applications/HP_Easy_Start.app.zip" + expectedTeamID="6HB5Y2QTA3" + ;; +hyper) + name="Hyper" + type="dmg" + if [[ $(arch) == i386 ]]; then + archiveName="mac-x64.dmg" + elif [[ $(arch) == arm64 ]]; then + archiveName="mac-arm64.dmg" + fi + downloadURL=$(downloadURLFromGit vercel hyper ) + appNewVersion=$(versionFromGit vercel hyper) + expectedTeamID="JW6Y669B67" + ;; +icons) + # credit: Mischa van der Bent (@mischavdbent) + name="Icons" + type="zip" + downloadURL=$(downloadURLFromGit sap macOS-icon-generator ) + appNewVersion=$(versionFromGit sap macOS-icon-generator ) + expectedTeamID="7R5ZEU67FQ" + ;; +imazingprofileeditor) + # Credit: Bilal Habib @Pro4TLZZZ + name="iMazing Profile Editor" + type="dmg" + downloadURL="https://downloads.imazing.com/mac/iMazing-Profile-Editor/iMazingProfileEditorMac.dmg" + expectedTeamID="J5PR93692Y" + ;; +inkscape) + # credit: Søren Theilgaard (@theilgaard) + name="Inkscape" + type="dmg" + downloadURL="https://inkscape.org$(curl -fs https://inkscape.org$(curl -fsJL https://inkscape.org/release/ | grep "/release/" | grep en | head -n 1 | cut -d '"' -f 6)mac-os-x/1010-1015/dl/ | grep "click here" | cut -d '"' -f 2)" + #appNewVersion=$(curl -fsJL https://inkscape.org/release/ | grep "
<' '\n' | awk -F'"' '/x86_64.dmg/ {print $6}' | head -1)
+ #appNewVersion=$( curl -fs https://www.vagrantup.com/downloads.html | grep -i "Current Version" )
+ appNewVersion=$(versionFromGit hashicorp vagrant)
+ expectedTeamID="D38WU7D763"
+ ;;
+vanilla)
+ name="Vanilla"
+ type="dmg"
+ downloadURL="https://macrelease.matthewpalmer.net/Vanilla.dmg"
+ expectedTeamID="Z4JV2M65MH"
+ ;;
+veracrypt)
+ name="VeraCrypt"
+ type="pkgInDmg"
+ #downloadURL=$(curl -s -L "https://www.veracrypt.fr/en/Downloads.html" | grep -Eio 'href="https://launchpad.net/veracrypt/trunk/(.*)/+download/VeraCrypt_([0-9].*).dmg"' | cut -c7- | sed -e 's/"$//' | sed "s/+/+/g")
+ downloadURL=$(curl -fs "https://www.veracrypt.fr/en/Downloads.html" | grep "https.*\.dmg" | grep -vi "legacy" | tr '"' '\n' | grep "^https.*" | grep -vi ".sig" | sed "s/+/+/g")
+ appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*.*)\.dmg/\1/g' )
+ expectedTeamID="Z933746L2S"
+ ;;
+virtualbox)
+ # credit: AP Orlebeke (@apizz)
+ name="VirtualBox"
+ type="pkgInDmg"
+ pkgName="VirtualBox.pkg"
+ downloadURL=$(curl -fs "https://www.virtualbox.org/wiki/Downloads" \
+ | awk -F '"' "/OSX.dmg/ { print \$4 }")
+ appNewVersion=$(curl -fs "https://www.virtualbox.org/wiki/Downloads" | awk -F '"' "/OSX.dmg/ { print \$4 }" | sed -E 's/.*virtualbox\/([0-9.]*)\/.*/\1/')
+ expectedTeamID="VB5E2TV963"
+ ;;
+viscosity)
+ #credit: @matins
+ name="Viscosity"
+ type="dmg"
+ downloadURL="https://www.sparklabs.com/downloads/Viscosity.dmg"
+ appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z.\-]*%20([0-9.]*)\..*/\1/g' )
+ expectedTeamID="34XR7GXFPX"
+ ;;
+vivaldi)
+ name="Vivaldi"
+ type="tbz"
+ downloadURL=$(curl -fsL "https://update.vivaldi.com/update/1.0/public/mac/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2)
+ appNewVersion=$(curl -is "https://update.vivaldi.com/update/1.0/public/mac/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4)
+ expectedTeamID="4XF3XNRN6Y"
+ ;;
+vlc)
+ name="VLC"
+ type="dmg"
+ if [[ $(arch) == "arm64" ]]; then
+ downloadURL=$(curl -fs http://update.videolan.org/vlc/sparkle/vlc-arm64.xml | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2 )
+ appNewVersion=$(curl -fs http://update.videolan.org/vlc/sparkle/vlc-arm64.xml | xpath '//rss/channel/item[last()]/enclosure/@sparkle:version' 2>/dev/null | cut -d '"' -f 2 )
+ elif [[ $(arch) == "i386" ]]; then
+ downloadURL=$(curl -fs http://update.videolan.org/vlc/sparkle/vlc-intel64.xml | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2 )
+ appNewVersion=$(curl -fs http://update.videolan.org/vlc/sparkle/vlc-intel64.xml | xpath '//rss/channel/item[last()]/enclosure/@sparkle:version' 2>/dev/null | cut -d '"' -f 2 )
+ fi
+ expectedTeamID="75GAHG3SZQ"
+ ;;
+vmwarehorizonclient)
+ # credit: Oh4sh0 https://github.com/Oh4sh0
+ name="VMware Horizon Client"
+ type="dmg"
+ downloadURL=$(curl -fs "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=CART21FQ2_MAC_800&productId=1027&rPId=48989" | grep -o 'Url.*..dmg"' | cut -d '"' -f3)
+ appNewVersion=$(curl -fs "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=CART21FQ2_MAC_800&productId=1027&rPId=48989" | sed 's/.*-\(.*\)-.*/\1/')
+ expectedTeamID="EG7KH642X6"
+ ;;
+vscodium)
+ # credit: AP Orlebeke (@apizz)
+ name="VSCodium"
+ type="dmg"
+ downloadURL=$(curl -fs "https://api.github.com/repos/VSCodium/vscodium/releases/latest" | awk -F '"' "/browser_download_url/ && /dmg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
+ #downloadURL=$(downloadURLFromGit VSCodium vscodium) # Too many versions
+ appNewVersion=$(versionFromGit VSCodium vscodium)
+ expectedTeamID="C7S3ZQ2B8V"
+ appName="VSCodium.app"
+ blockingProcesses=( Electron )
+ ;;
+webexmeetings)
+ # credit: Erik Stam (@erikstam)
+ name="Cisco Webex Meetings"
+ type="pkgInDmg"
+ downloadURL="https://akamaicdn.webex.com/client/webexapp.dmg"
+ expectedTeamID="DE8Y96K9QP"
+ targetDir="/Applications"
+ #blockingProcessesMaxCPU="5"
+ blockingProcesses=( Webex )
+ ;;
+webex|\
+webexteams)
+ # credit: Erik Stam (@erikstam)
+ name="Webex"
+ type="dmg"
+ if [[ $(arch) == arm64 ]]; then
+ downloadURL="https://binaries.webex.com/WebexDesktop-MACOS-Apple-Silicon-Gold/Webex.dmg"
+ elif [[ $(arch) == i386 ]]; then
+ downloadURL="https://binaries.webex.com/WebexTeamsDesktop-MACOS-Gold/Webex.dmg"
+ fi
+ expectedTeamID="DE8Y96K9QP"
+ ;;
+whatsapp)
+ name="WhatsApp"
+ type="dmg"
+ downloadURL="https://web.whatsapp.com/desktop/mac/files/WhatsApp.dmg"
+ expectedTeamID="57T9237FN3"
+ ;;
+wickrme)
+ # credit: Søren Theilgaard (@theilgaard)
+ name="WickrMe"
+ type="dmg"
+ downloadURL=$( curl -fs https://me-download.wickr.com/api/download/me/download/mac | tr '"' '\n' | grep -e '^https://' )
+ appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
+ expectedTeamID="W8RC3R952A"
+ ;;
+wickrpro)
+ # credit: Søren Theilgaard (@theilgaard)
+ name="WickrPro"
+ type="dmg"
+ downloadURL=$( curl -fs https://me-download.wickr.com/api/download/pro/download/mac | tr '"' '\n' | grep -e '^https://' )
+ appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
+ expectedTeamID="W8RC3R952A"
+ ;;
+wireshark)
+ # credit: Oh4sh0 https://github.com/Oh4sh0
+ name="Wireshark"
+ type="dmg"
+ downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Intel%2064.dmg"
+ appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F '[()]' '{print $2}')
+ expectedTeamID="7Z6EMTD2C6"
+ ;;
+wwdc)
+ # credit: Søren Theilgaard (@theilgaard)
+ name="WWDC"
+ type="dmg"
+ downloadURL=$(downloadURLFromGit insidegui WWDC)
+ appNewVersion=$(versionFromGit insidegui WWDC)
+ expectedTeamID="8C7439RJLG"
+ ;;
+xink)
+ name="Xink"
+ type="zip"
+ downloadURL="https://downloads.xink.io/macos/client"
+ #appNewVersion=$() # Cannot find version history or release notes on home page
+ expectedTeamID="F287823HVS"
+ ;;
+xquartz)
+ # credit: AP Orlebeke (@apizz)
+ name="XQuartz"
+ type="pkgInDmg"
+ downloadURL=$(downloadURLFromGit XQuartz XQuartz)
+ appNewVersion=$(versionFromGit XQuartz XQuartz)
+ expectedTeamID="NA574AWV7E"
+ ;;
+yubikeymanagerqt)
+ # credit: Tadayuki Onishi (@kenchan0130)
+ name="YubiKey Manager GUI"
+ type="pkg"
+ downloadURL="https://developers.yubico.com/yubikey-manager-qt/Releases/$(curl -sfL https://api.github.com/repos/Yubico/yubikey-manager-qt/releases/latest | awk -F '"' '/"tag_name"/ { print $4 }')-mac.pkg"
+ #appNewVersion=$(curl -fs https://developers.yubico.com/yubikey-manager-qt/Releases/ | grep mac.pkg | head -1 | sed -E "s/.*-([0-9.]*)-mac.*/\1/") # does not work
+ appNewVersion=$(versionFromGit Yubico yubikey-manager-qt)
+ expectedTeamID="LQA3CS5MM7"
+ ;;
+xeroxphaser7800)
+ name="XeroxPhaser"
+ type="pkgInDmg"
+ downloadURL=$(curl -fs "https://www.support.xerox.com/en-us/product/phaser-7800/downloads?platform=macOSx11" | xmllint --html --format - 2>/dev/null | grep -o "https://.*XeroxDrivers.*.dmg")
+ expectedTeamID="G59Y3XFNFR"
+ ;;
+zappy)
+ name="Zappy"
+ type="appInDmgInZip"
+ downloadURL="https://zappy.zapier.com/releases/zappy-latest.zip"
+ expectedTeamID="6LS97Q5E79"
+ ;;
+zoom)
+ # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
+ name="Zoom.us"
+ type="pkg"
+ downloadURL="https://zoom.us/client/latest/ZoomInstallerIT.pkg"
+ appNewVersion=$(curl -fs -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" "https://zoom.us/download" | grep Version | head -n 1 | sed -E 's/.* ([0-9.]* \(.*\)).*/\1/') # credit: Søren Theilgaard (@theilgaard)
+ expectedTeamID="BJ4HAAB9B3"
+ blockingProcesses=( zoom.us )
+ ;;
+zoomclient)
+ name="zoom.us"
+ type="pkg"
+ packageID="us.zoom.pkg.videmeeting"
+ downloadURL="https://zoom.us/client/latest/Zoom.pkg"
+ expectedTeamID="BJ4HAAB9B3"
+ #appNewVersion=$(curl -is "https://beta2.communitypatch.com/jamf/v1/ba1efae22ae74a9eb4e915c31fef5dd2/patch/zoom.us" | grep currentVersion | tr ',' '\n' | grep currentVersion | cut -d '"' -f 4) # Does not match packageID
+ blockingProcesses=( zoom.us )
+ #blockingProcessesMaxCPU="5"
+ ;;
+zoomrooms)
+ name="ZoomRooms"
+ type="pkg"
+ packageID="us.zoom.pkg.zp"
+ downloadURL="https://zoom.us/client/latest/ZoomRooms.pkg"
+ appNewVersion="$(curl -fsIL ${downloadURL} | grep -i location | cut -d "/" -f5)"
+ expectedTeamID="BJ4HAAB9B3"
+ blockingProcesses=( "ZoomPresence" )
+ ;;
+zulujdk11)
+ name="Zulu JDK 11"
+ type="pkgInDmg"
+ packageID="com.azulsystems.zulu.11"
+ if [[ $(arch) == i386 ]]; then
+ downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu11.*ca-jdk11.*x64.dmg" | sed 's/\\//g')
+ elif [[ $(arch) == arm64 ]]; then
+ downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu11.*ca-jdk11.*aarch64.dmg" | sed 's/\\//g')
+ fi
+ expectedTeamID="TDTHCUPYFR"
+ appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
+ appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
+ ;;
+zulujdk13)
+ name="Zulu JDK 13"
+ type="pkgInDmg"
+ packageID="com.azulsystems.zulu.13"
+ if [[ $(arch) == i386 ]]; then
+ downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu13.*ca-jdk13.*x64.dmg" | sed 's/\\//g')
+ elif [[ $(arch) == arm64 ]]; then
+ downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu13.*ca-jdk13.*aarch64.dmg" | sed 's/\\//g')
+ fi
+ expectedTeamID="TDTHCUPYFR"
+ appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
+ appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
+ ;;
+zulujdk15)
+ name="Zulu JDK 15"
+ type="pkgInDmg"
+ packageID="com.azulsystems.zulu.15"
+ if [[ $(arch) == i386 ]]; then
+ downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu15.*ca-jdk15.*x64.dmg" | sed 's/\\//g')
+ elif [[ $(arch) == arm64 ]]; then
+ downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu15.*ca-jdk15.*aarch64.dmg" | sed 's/\\//g')
+ fi
+ expectedTeamID="TDTHCUPYFR"
+ appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
+ appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
+ ;;
+
+# MARK: Add new labels after this line (let us sort them in the list)
+
+
+# MARK: Add new labels above here
+
+#cdef)
+# # cdef currently not signed
+# # credit: Søren Theilgaard (@theilgaard)
+# name="cdef"
+# type="pkg"
+# downloadURL=$(downloadURLFromGit Shufflepuck cdef)
+# appNewVersion=$(versionFromGit Shufflepuck cdef)
+# #expectedTeamID="EM3ER8T33A"
+# ;;
+#fontforge)
+# # FontForge Not signed
+# # credit: Søren Theilgaard (@theilgaard)
+# name="FontForge"
+# type="dmg"
+# downloadURL=$(downloadURLFromGit fontforge fontforge)
+# appNewVersion=$(versionFromGit fontforge fontforge)
+# expectedTeamID=""
+# ;;
+#notifier)
+# # not signed
+# # credit: Søren Theilgaard (@theilgaard)
+# name="dataJAR Notifier"
+# type="pkg"
+# #packageID="uk.co.dataJAR.Notifier" # Version 2.2.3 was actually "uk.co.dataJAR.Notifier-2.2.3" so unusable
+# downloadURL=$(downloadURLFromGit dataJAR Notifier)
+# appNewVersion=$(versionFromGit dataJAR Notifier)
+# expectedTeamID=""
+# blockingProcesses=( "Notifier" )
+# ;;
+# packages)
+# NOTE: Packages is signed but _not_ notarized, so spctl will reject it
+# name="Packages"
+# type="pkgInDmg"
+# pkgName="Install Packages.pkg"
+# downloadURL="http://s.sudre.free.fr/Software/files/Packages.dmg"
+# expectedTeamID="NL5M9E394P"
+# ;;
+# powershell)
+# NOTE: powershell installers are not notarized
+# # credit: Tadayuki Onishi (@kenchan0130)
+# name="PowerShell"
+# type="pkg"
+# downloadURL=$(curl -fs "https://api.github.com/repos/Powershell/Powershell/releases/latest" \
+# | awk -F '"' '/browser_download_url/ && /pkg/ { print $4 }' | grep -v lts )
+# expectedTeamID="UBF8T346G9"
+# ;;
+# powershell-lts)
+# NOTE: powershell installers are not notarized
+# # credit: Tadayuki Onishi (@kenchan0130)
+# name="PowerShell"
+# type="pkg"
+# downloadURL=$(curl -fs "https://api.github.com/repos/Powershell/Powershell/releases/latest" \
+# | awk -F '"' '/browser_download_url/ && /pkg/ { print $4 }' | grep lts)
+# expectedTeamID="UBF8T346G9"
+# ;;
+# vmwarefusion)
+# TODO: vmwarefusion installation process needs testing
+# # credit: Erik Stam (@erikstam)
+# name="VMware Fusion"
+# type="dmg"
+# downloadURL="https://www.vmware.com/go/getfusion"
+# appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*Fusion-([0-9.]*)-.*/\1/g' )
+# expectedTeamID="EG7KH642X6"
+# ;;
+#wordmat)
+# # WordMat currently not signed
+# # credit: Søren Theilgaard (@theilgaard)
+# name="WordMat"
+# type="pkg"
+# packageID="com.eduap.pkg.WordMat"
+# downloadURL=$(downloadURLFromGit Eduap-com WordMat)
+# #downloadURL=$(curl -fs "https://api.github.com/repos/Eduap-com/WordMat/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
+# appNewVersion=$(versionFromGit Eduap-com WordMat)
+# #curl -fs "https://api.github.com/repos/Eduap-com/WordMat/releases/latest" | grep tag_name | cut -d '"' -f 4 | sed 's/[^0-9\.]//g'
+# expectedTeamID=""
+# ;;
+
+
+# MARK: Microsoft
+
+# msupdate codes from:
+# https://docs.microsoft.com/en-us/deployoffice/mac/update-office-for-mac-using-msupdate
+
+# download link IDs from: https://macadmin.software
+
+microsoftautoupdate)
+ name="Microsoft AutoUpdate"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=830196"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.autoupdate.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "Microsoft_AutoUpdate.*pkg" | sed -E 's/[a-zA-Z_]*_([0-9.]*)_.*/\1/g' | cut -d "." -f 1-2)
+ expectedTeamID="UBF8T346G9"
+ # commented the updatetool for MSAutoupdate, because when Autoupdate is really
+ # old or broken, you want to force a new install
+ #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ #updateToolArguments=( --install --apps MSau04 )
+ ;;
+microsoftcompanyportal)
+ name="Company Portal"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=869655"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.intunecompanyportal.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/CompanyPortal_.*pkg" | cut -d "_" -f 2 | cut -d "-" -f 1)
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps IMCP01 )
+ ;;
+microsoftdefenderatp)
+ name="Microsoft Defender ATP"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=2097502"
+ appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.defender.standalone"]/version' 2>/dev/null | sed -E 's/([0-9.]*) .*/\1/')
+ # No version number in download url
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps WDAV00 )
+ ;;
+microsoftedge|\
+microsoftedgeconsumerstable)
+ name="Microsoft Edge"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=2069148"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.edge"]/cfbundleversion' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/MicrosoftEdge.*pkg" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps EDGE01 )
+ ;;
+microsoftedgeenterprisestable)
+ name="Microsoft Edge"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=2093438"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.edge"]/version' 2>/dev/null | sed -E 's/([0-9.]*) .*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/MicrosoftEdge.*pkg" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps EDGE01 )
+ ;;
+microsoftexcel)
+ name="Microsoft Excel"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=525135"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.excel.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps XCEL2019 )
+ ;;
+microsoftlicenseremovaltool)
+ # credit: Isaac Ordonez (@isaac) macadmins slack
+ name="Microsoft License Removal Tool"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=849815"
+ expectedTeamID="QGS93ZLCU7"
+ appNewVersion=$(curl -is "$downloadURL" | grep ocation: | grep -o "Microsoft_.*pkg" | cut -d "_" -f 5 | cut -d "." -f1-2)
+ Company="Microsoft"
+ ;;
+microsoftoffice365)
+ name="MicrosoftOffice365"
+ type="pkg"
+ packageID="com.microsoft.pkg.licensing"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=525133"
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3)
+ expectedTeamID="UBF8T346G9"
+ # using MS PowerPoint as the 'stand-in' for the entire suite
+ #appName="Microsoft PowerPoint.app"
+ blockingProcesses=( "Microsoft AutoUpdate" "Microsoft Word" "Microsoft PowerPoint" "Microsoft Excel" "Microsoft OneNote" "Microsoft Outlook" "OneDrive" )
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install )
+ ;;
+microsoftofficebusinesspro)
+ name="MicrosoftOfficeBusinessPro"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=2009112"
+ expectedTeamID="UBF8T346G9"
+ # using MS PowerPoint as the 'stand-in' for the entire suite
+ appName="Microsoft PowerPoint.app"
+ blockingProcesses=( "Microsoft AutoUpdate" "Microsoft Word" "Microsoft PowerPoint" "Microsoft Excel" "Microsoft OneNote" "Microsoft Outlook" "OneDrive" "Teams")
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install )
+ ;;
+microsoftonedrive)
+ name="OneDrive"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=823060"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.onedrive.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | cut -d "/" -f 6 | cut -d "." -f 1-3)
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps ONDR18 )
+ ;;
+microsoftonenote)
+ name="Microsoft OneNote"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=820886"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.onenote.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps ONMC2019 )
+ ;;
+microsoftoutlook)
+ name="Microsoft Outlook"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=525137"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.outlook.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps OPIM2019 )
+ ;;
+microsoftpowerpoint)
+ name="Microsoft PowerPoint"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=525136"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.powerpoint.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps PPT32019 )
+ ;;
+microsoftremotedesktop)
+ name="Microsoft Remote Desktop"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=868963"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.remotedesktop.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_Remote_Desktop.*pkg" | cut -d "_" -f 4)
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps MSRD10 )
+ ;;
+microsoftsharepointplugin)
+ # Microsoft has marked this "oldpackage", should probably not be used anymore
+ name="MicrosoftSharePointPlugin"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=800050"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/oldpackage[id="com.microsoft.sharepointplugin.standalone"]/version' 2>/dev/null | sed -E 's/([0-9.]*) .*/\1/')
+ expectedTeamID="UBF8T346G9"
+ # TODO: determine blockingProcesses for SharePointPlugin
+ ;;
+microsoftskypeforbusiness)
+ name="Skype for Business"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=832978"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.skypeforbusiness.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps MSFB16 )
+ ;;
+microsoftteams)
+ name="Microsoft Teams"
+ type="pkg"
+ #packageID="com.microsoft.teams"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=869428"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.teams.standalone"]/version' 2>/dev/null | sed -E 's/([0-9.]*) .*/\1/')
+ # Still using macadmin.software for version, as the path does not contain the version in a matching format. packageID can be used, but version is the same.
+ expectedTeamID="UBF8T346G9"
+ blockingProcesses=( Teams "Microsoft Teams Helper" )
+ # Commenting out msupdate as it is not really supported *yet* for teams
+ # updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ # updateToolArguments=( --install --apps TEAM01 )
+ ;;
+microsoftvisualstudiocode|\
+visualstudiocode)
+ name="Visual Studio Code"
+ type="zip"
+ #downloadURL="https://go.microsoft.com/fwlink/?LinkID=620882" # Intel only
+ downloadURL="https://go.microsoft.com/fwlink/?LinkID=2156837" # Universal
+ appNewVersion=$(curl -fsL "https://code.visualstudio.com/Updates" | grep "/darwin" | grep -oiE ".com/([^>]+)([^<]+)/darwin" | cut -d "/" -f 2 | sed $'s/[^[:print:]\t]//g' | head -1 )
+ expectedTeamID="UBF8T346G9"
+ appName="Visual Studio Code.app"
+ blockingProcesses=( Code )
+ ;;
+microsoftword)
+ name="Microsoft Word"
+ type="pkg"
+ downloadURL="https://go.microsoft.com/fwlink/?linkid=525134"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.word.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+ expectedTeamID="UBF8T346G9"
+ updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ updateToolArguments=( --install --apps MSWD2019 )
+ ;;
+microsoftyammer)
+ name="Yammer"
+ type="dmg"
+ downloadURL="https://aka.ms/yammer_desktop_mac"
+ #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/oldpackage[id="com.microsoft.yammer.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/([0-9.]*)<.*/\1/')
+ appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+ expectedTeamID="UBF8T346G9"
+ #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+ #updateToolArguments=( --install --apps ?????? )
+ ;;
+
+# this description is so you can provide all variables as arguments
+# it will only check if the required variables are setting
+valuesfromarguments)
+ if [[ -z $name ]]; then
+ printlog "need to provide 'name'"
+ exit 1
+ fi
+ if [[ -z $type ]]; then
+ printlog "need to provide 'type'"
+ exit 1
+ fi
+ if [[ -z $downloadURL ]]; then
+ printlog "need to provide 'downloadURL'"
+ exit 1
+ fi
+ if [[ -z $expectedTeamID ]]; then
+ printlog "need to provide 'expectedTeamID'"
+ exit 1
+ fi
+ ;;
+
+# these descriptions exist for testing and are intentionally broken
+brokendownloadurl)
+ name="Google Chrome"
+ type="dmg"
+ downloadURL="https://broken.com/broken.dmg"
+ expectedTeamID="EQHXZ8M8AV"
+ ;;
+brokenappname)
+ name="brokenapp"
+ type="dmg"
+ downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
+ expectedTeamID="EQHXZ8M8AV"
+ ;;
+brokenteamid)
+ name="Google Chrome"
+ type="dmg"
+ downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
+ expectedTeamID="broken"
+ ;;
+*)
+ # unknown label
+ #printlog "unknown label $label"
+ cleanupAndExit 1 "unknown label $label"
+ ;;
+esac
+
+
+# MARK: application download and installation starts here
+
+printlog "BLOCKING_PROCESS_ACTION=${BLOCKING_PROCESS_ACTION}"
+printlog "NOTIFY=${NOTIFY}"
+
+# Finding LOGO to use in dialogs
+case $LOGO in
+ appstore)
+ # Apple App Store on Mac
+ if [[ $(sw_vers -buildVersion) > "19" ]]; then
+ LOGO="/System/Applications/App Store.app/Contents/Resources/AppIcon.icns"
+ else
+ LOGO="/Applications/App Store.app/Contents/Resources/AppIcon.icns"
+ fi
+ ;;
+ jamf)
+ # Jamf Pro
+ LOGO="/Library/Application Support/JAMF/Jamf.app/Contents/Resources/AppIcon.icns"
+ ;;
+ mosyleb)
+ # Mosyle Business
+ LOGO="/Applications/Self-Service.app/Contents/Resources/AppIcon.icns"
+ ;;
+ mosylem)
+ # Mosyle Manager (education)
+ LOGO="/Applications/Manager.app/Contents/Resources/AppIcon.icns"
+ ;;
+ addigy)
+ # Addigy
+ LOGO="/Library/Addigy/macmanage/MacManage.app/Contents/Resources/atom.icns"
+ ;;
+esac
+if [[ ! -a "${LOGO}" ]]; then
+ if [[ $(sw_vers -buildVersion) > "19" ]]; then
+ LOGO="/System/Applications/App Store.app/Contents/Resources/AppIcon.icns"
+ else
+ LOGO="/Applications/App Store.app/Contents/Resources/AppIcon.icns"
+ fi
+fi
+printlog "LOGO=${LOGO}"
+
+# MARK: extract info from data
+if [ -z "$archiveName" ]; then
+ case $type in
+ dmg|pkg|zip|tbz)
+ archiveName="${name}.$type"
+ ;;
+ pkgInDmg)
+ archiveName="${name}.dmg"
+ ;;
+ *InZip)
+ archiveName="${name}.zip"
+ ;;
+ updateronly)
+ ;;
+ *)
+ printlog "Cannot handle type $type"
+ cleanupAndExit 99
+ ;;
+ esac
+fi
+
+if [ -z "$appName" ]; then
+ # when not given derive from name
+ appName="$name.app"
+fi
+
+if [ -z "$targetDir" ]; then
+ case $type in
+ dmg|zip|tbz|app*)
+ targetDir="/Applications"
+ ;;
+ pkg*)
+ targetDir="/"
+ ;;
+ updateronly)
+ ;;
+ *)
+ printlog "Cannot handle type $type"
+ cleanupAndExit 99
+ ;;
+ esac
+fi
+
+if [[ -z $blockingProcesses ]]; then
+ printlog "no blocking processes defined, using $name as default"
+ blockingProcesses=( $name )
+fi
+
+# MARK: determine tmp dir
+if [ "$DEBUG" -ne 0 ]; then
+ # for debugging use script dir as working directory
+ tmpDir=$(dirname "$0")
+else
+ # create temporary working directory
+ tmpDir=$(mktemp -d )
+fi
+
+# MARK: change directory to temporary working directory
+printlog "Changing directory to $tmpDir"
+if ! cd "$tmpDir"; then
+ printlog "error changing directory $tmpDir"
+ cleanupAndExit 1
+fi
+
+# MARK: get installed version
+getAppVersion
+printlog "appversion: $appversion"
+
+# MARK: Exit if new version is the same as installed version (appNewVersion specified)
+# credit: Søren Theilgaard (@theilgaard)
+if [[ -n $appNewVersion ]]; then
+ printlog "Latest version of $name is $appNewVersion"
+ if [[ $appversion == $appNewVersion ]]; then
+ if [[ $DEBUG -eq 0 ]]; then
+ printlog "There is no newer version available."
+ if [[ $INSTALL != "force" ]]; then
+ message="$name, version $appNewVersion, is the latest version."
+ if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
+ printlog "notifying"
+ displaynotification "$message" "No update for $name!"
+ fi
+ cleanupAndExit 0 "No newer version."
+ else
+ printlog "Using force to install anyway. Not using updateTool."
+ updateTool=""
+ fi
+ else
+ printlog "DEBUG mode enabled, not exiting, but there is no new version of app."
+ fi
+ fi
+else
+ printlog "Latest version not specified."
+ if [[ $INSTALL == "force" ]]; then
+ printlog "Using force to install, so not using updateTool."
+ updateTool=""
+ fi
+fi
+
+# MARK: check if this is an Update and we can use updateTool
+if [[ (-n $appversion && -n "$updateTool") || "$type" == "updateronly" ]]; then
+ printlog "appversion & updateTool"
+ if [[ $DEBUG -eq 0 ]]; then
+ if runUpdateTool; then
+ finishing
+ cleanupAndExit 0
+ elif [[ $type == "updateronly" ]];then
+ printlog "type is $type so we end here."
+ cleanupAndExit 0
+ fi # otherwise continue
+ else
+ printlog "DEBUG mode enabled, not running update tool"
+ fi
+fi
+
+# MARK: download the archive
+if [ -f "$archiveName" ] && [ "$DEBUG" -ne 0 ]; then
+ printlog "$archiveName exists and DEBUG enabled, skipping download"
+else
+ # download the dmg
+ printlog "Downloading $downloadURL to $archiveName"
+ if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
+ printlog "notifying"
+ displaynotification "Downloading $name update" "Download in progress …"
+ fi
+ 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
+ printlog "notifying"
+ displaynotification "$message" "Error installing/updating $name"
+ fi
+ cleanupAndExit 2
+ fi
+fi
+
+# MARK: when user is logged in, and app is running, prompt user to quit app
+if [[ $BLOCKING_PROCESS_ACTION == "ignore" ]]; then
+ printlog "ignoring blocking processes"
+else
+ if [[ $currentUser != "loginwindow" ]]; then
+ if [[ ${#blockingProcesses} -gt 0 ]]; then
+ if [[ ${blockingProcesses[1]} != "NONE" ]]; then
+ checkRunningProcesses
+ fi
+ fi
+ fi
+fi
+
+# MARK: install the download
+printlog "Installing $name"
+if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
+ printlog "notifying"
+ displaynotification "Installing $name" "Installation in progress …"
+fi
+
+case $type in
+ dmg)
+ installFromDMG
+ ;;
+ pkg)
+ installFromPKG
+ ;;
+ zip)
+ installFromZIP
+ ;;
+ tbz)
+ installFromTBZ
+ ;;
+ pkgInDmg)
+ installPkgInDmg
+ ;;
+ pkgInZip)
+ installPkgInZip
+ ;;
+ appInDmgInZip)
+ installAppInDmgInZip
+ ;;
+ *)
+ printlog "Cannot handle type $type"
+ cleanupAndExit 99
+ ;;
+esac
+
+# MARK: Finishing — print installed application location and version
+finishing
+
+# all done!
+cleanupAndExit 0
diff --git a/Labels.txt b/Labels.txt
index da6bf23..2bcc748 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -1,4 +1,5 @@
1password7
+4kvideodownloader
8x8
abstract
adobebrackets
@@ -8,20 +9,32 @@ adobereaderdc-install
adobereaderdc-update
aircall
airserver
+aldente
alfred
+alttab
amazonchime
amazonworkspaces
androidfiletransfer
+anydesk
apparency
appcleaner
+applenyfonts
+applesfcompact
+applesfmono
+applesfpro
aquaskk
+arq7
+atext
atom
+audacity
autodmg
autopkgr
aviatrix
awscli2
awsvpnclient
balenaetcher
+balsamiqwireframes
+bartender
basecamp3
bbedit
bettertouchtool
@@ -36,6 +49,7 @@ camostudio
camtasia
citrixworkspace
clevershare2
+clickshare
code42
coderunner
cormorant
@@ -45,6 +59,7 @@ dangerzone
darktable
dbeaverce
debookee
+defaultfolderx
depnotify
desktoppr
detectxswift
@@ -52,19 +67,24 @@ devonthink
dialpad
discord
docker
+drift
dropbox
easeusdatarecoverywizard
egnyte
element
eraseinstall
etrecheck
+evernote
exelbanstats
fantastical
+favro
ferdi
figma
firefox
firefox_da
+firefox_intl
firefoxesr
+firefoxesr_intl
firefoxesrpkg
firefoxpkg
front
@@ -79,20 +99,23 @@ googledrivebackupandsync
googledrivefilestream
googleearth
googlejapaneseinput
+googlesoftwareupdate
gotomeeting
gpgsuite
gpgsync
grandperspective
+grasshopper
gyazo
gyazogif
+hancock
handbrake
hazel
hpeasyadmin
hpeasystart
hyper
icons
+imazingprofileeditor
inkscape
-installomator_st
installomator_theile
intellijideace
istatmenus
@@ -111,6 +134,7 @@ karabinerelements
keepassxc
keka
keyboardmaestro
+keyboardmaestro
klokki
knockknock
krisp
@@ -119,6 +143,7 @@ lastpass
launchbar
lexarrecoverytool
libreoffice
+logitechoptions
loom
lucifer
lulu
@@ -155,6 +180,7 @@ nomad
nomadlogin
notion
nvivo
+obs
obsidian
odrive
omnidisksweeper
@@ -180,6 +206,7 @@ prism9
privileges
proctortrack
promiseutilityr
+proxyman
pycharmce
pymol
r
@@ -199,11 +226,13 @@ royaltsx
rstudio
santa
screamingfrogseospider
+screenflick
sfsymbols
shield
sidekick
signal
silnite
+sirimote
sizeup
sketch
skype
@@ -218,24 +247,30 @@ sonoss2
sourcetree
spotify
sublimetext
+supportapp
suspiciouspackage
swiftruntimeforcommandlinetools
+tableaudesktop
tableaureader
taskpaper
teamviewer
teamviewerhost
teamviewerqs
+techsmithcapture
telegram
+textexpander
textmate
+theunarchiver
things
thunderbird
tigervnc
toggltrack
torbrowser
+trex
tunnelbear
tunnelblick
umbrellaroamingclient
-universaltypeclient
+uniconverter
universaltypeclient
vagrant
vanilla
@@ -247,18 +282,22 @@ vivaldi
vlc
vmwarehorizonclient
vscodium
+webex
webexmeetings
webexteams
whatsapp
wickrme
wickrpro
wireshark
+wwdc
xeroxphaser7800
xink
+xquartz
yubikeymanagerqt
zappy
zoom
zoomclient
+zoomrooms
zulujdk11
zulujdk13
zulujdk15
diff --git a/README.md b/README.md
index e8b7e64..98ac02b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ I have put a lot of work into making it stable and safe, but I cannot - of cours
## Support and Contributing
-Discussion, support and advice around Installomator happens in the `#installomator` channel in the [MacAdmins Slack](https:/macadmins.org). Go there for support questions.
+Discussion, support and advice around Installomator happens in the `#installomator` channel in the [MacAdmins.org Slack](https://macadmins.org). Go there for support questions.
Do not create an issue just when you have a questions, but do file an issue or pull request for bugs or wrong behavior. When in doubt, ask in the above Slack channel.
diff --git a/buildInstallomatorPkg.sh b/buildInstallomatorPkg.sh
index aac9ac5..d5863fd 100755
--- a/buildInstallomatorPkg.sh
+++ b/buildInstallomatorPkg.sh
@@ -10,66 +10,19 @@
export PATH=/usr/bin:/bin:/usr/sbin:/sbin
pkgname="Installomator"
-version="0.5"
+version="0.6"
identifier="com.scriptingosx.${pkgname}"
install_location="/usr/local/Installomator/"
signature="Developer ID Installer: Armin Briegel (JME5BW3F3R)"
dev_team="JME5BW3F3R" # asc-provider
dev_account="developer@scriptingosx.com"
-dev_keychain_label="Developer-altool"
+dev_keychain_label="notary-scriptingosx"
scriptfolder=$(dirname "$0")
projectfolder=$(mktemp -d)
payloadfolder="${projectfolder}/payload"
-# MARK: functions
-requeststatus() { # $1: requestUUID
- requestUUID=${1?:"need a request UUID"}
- req_status=$(xcrun altool --notarization-info "$requestUUID" \
- --username "$dev_account" \
- --password "@keychain:$dev_keychain_label" 2>&1 | awk -F ': ' '/Status:/ { print $2; }' )
- echo "$req_status"
-}
-
-notarizefile() { # $1: path to file to notarize, $2: identifier
- filepath=${1:?"need a filepath"}
- identifier=${2:?"need an identifier"}
-
- # upload file
- echo "## uploading $filepath for notarization"
- requestUUID=$(xcrun altool --notarize-app \
- --primary-bundle-id "$identifier" \
- --username "$dev_account" \
- --password "@keychain:$dev_keychain_label" \
- --asc-provider "$dev_team" \
- --file "$filepath" 2>&1 | awk '/RequestUUID/ { print $NF; }')
-
- echo "Notarization RequestUUID: $requestUUID"
-
- if [[ $requestUUID == "" ]]; then
- echo "could not upload for notarization"
- exit 1
- fi
-
- # wait for status to be not "in progress" any more
- request_status="in progress"
- while [[ "$request_status" == "in progress" ]]; do
- echo -n "waiting... "
- sleep 10
- request_status=$(requeststatus "$requestUUID")
- echo "$request_status"
- done
-
- if [[ $request_status != "success" ]]; then
- echo "## could not notarize $filepath"
- xcrun altool --notarization-info "$requestUUID" \
- --username "$dev_account" \
- --password "@keychain:$dev_keychain_label"
- exit 1
- fi
-
-}
# MARK: main code starts here
@@ -94,7 +47,6 @@ pkgbuild --root "${projectfolder}/payload" \
--install-location "${install_location}" \
"${pkgpath}"
-
# build the product archive
productpath="${scriptfolder}/${pkgname}-${version}.pkg"
@@ -108,8 +60,10 @@ productbuild --package "${pkgpath}" \
# clean up project folder
rm -Rf "${projectfolder}"
+# NOTE: notarytool requires Xcode 13
+
# upload for notarization
-notarizefile "$productpath" "$identifier"
+xcrun notarytool submit "$productpath" --keychain-profile "$dev_keychain_label" --wait
# staple result
echo "## Stapling $productpath"
diff --git a/utils/buildCaseStatement.sh b/utils/buildCaseStatement.sh
index 583c85f..060f75f 100755
--- a/utils/buildCaseStatement.sh
+++ b/utils/buildCaseStatement.sh
@@ -5,6 +5,10 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin
downloadURL=${1?:"need to provide a download URL"}
# Note: this tool _very_ experimental and does not work in many cases
+# That being said, it's a great place to start for building up the label in the Case-statement
+
+# Usage
+# ./buildCaseStatement.sh
# create temporary working directory
@@ -20,15 +24,7 @@ fi
# download the URL
echo "Downloading $downloadURL"
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-if ! archivePath=$(curl -fsL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}"); then
-=======
if ! downloadOut="$(curl -fsL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
->>>>>>> Stashed changes
-=======
-if ! downloadOut="$(curl -fsL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
->>>>>>> 4932ea6a3186d902d88c9bb5a3774c6ff81b1608
echo "error downloading $downloadURL"
exit 2
fi
@@ -44,13 +40,6 @@ xpath() {
fi
}
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-#archivePath=$(find $tmpDir -print )
-echo "archivePath: $archivePath"
-archiveName=${archivePath##*/}
-echo "archiveName: $archiveName"
-=======
pkgInvestigation() {
echo "Package found"
teamID=$(spctl -a -vv -t install "$archiveName" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' )
@@ -81,39 +70,6 @@ echo "archivePath: $archivePath"
archiveName=${archivePath##*/}
echo "archiveName: $archiveName"
mv $archiveTempName $archiveName
->>>>>>> Stashed changes
-=======
-pkgInvestigation() {
- echo "Package found"
- teamID=$(spctl -a -vv -t install "$archiveName" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' )
- echo "For PKGs it's advised to find packageID for version checking"
-
- pkgutil --expand "$pkgPath" "$archiveName"_pkg
- cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null
- packageID="$(cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null | tr ' ' '\n' | grep -i "id" | cut -d \" -f 2)"
- rm -r "$archiveName"_pkg
- echo "$packageID"
- echo "Above is the possible packageIDs that can be used, and the correct one is probably one of those with a version number. More investigation might be needed to figure out correct packageID if several are displayed."
-}
-appInvestigation() {
- appName=${appPath##*/}
-
- # verify with spctl
- echo "Verifying: $appPath"
- if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then
- echo "Error verifying $appPath"
- exit 4
- fi
-}
-echo "downloadOut: ${downloadOut}"
-archiveTempName=$( echo "${downloadOut}" | head -1 )
-echo "archiveTempName: $archiveTempName"
-archivePath=$( echo "${downloadOut}" | tail -1 )
-echo "archivePath: $archivePath"
-archiveName=${archivePath##*/}
-echo "archiveName: $archiveName"
-mv $archiveTempName $archiveName
->>>>>>> 4932ea6a3186d902d88c9bb5a3774c6ff81b1608
name=${archiveName%.*}
echo "name: $name"
archiveExt=${archiveName##*.}
@@ -122,25 +78,8 @@ identifier=$(echo $name | tr '[:upper:]' '[:lower:]')
echo "identifier: $identifier"
if [ "$archiveExt" = "pkg" ]; then
-<<<<<<< HEAD
-<<<<<<< Updated upstream
- echo "Package found"
- teamID=$(spctl -a -vv -t install "$archiveName" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' )
- echo "For PKGs it's advised to find packageID for version checking"
- pkgutil --expand "$archiveName" "$archiveName"_pkg
- cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null
- packageID="$(cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null | tr ' ' '\n' | grep -i "id" | cut -d \" -f 2)"
- rm -r "$archiveName"_pkg
- echo "$packageID"
- echo "Above is the possible packageIDs that can be used, and the correct one is probably one of those with a version number. More investigation might be needed to figure out correct packageID if several are displayed."
-=======
pkgPath="$archiveName"
pkgInvestigation
->>>>>>> Stashed changes
-=======
- pkgPath="$archiveName"
- pkgInvestigation
->>>>>>> 4932ea6a3186d902d88c9bb5a3774c6ff81b1608
elif [ "$archiveExt" = "dmg" ]; then
echo "Diskimage found"
# mount the dmg
@@ -182,15 +121,7 @@ elif [ "$archiveExt" = "zip" ] || [ "$archiveExt" = "tbz" ]; then
fi
echo
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-echo "appNewVersion is often difficult to find. Can sometimes be found in the filename, but also on a web page."
-=======
echo "appNewVersion is often difficult to find. Can sometimes be found in the filename, but also on a web page. See archivePath above if link contains information about this."
->>>>>>> Stashed changes
-=======
-echo "appNewVersion is often difficult to find. Can sometimes be found in the filename, but also on a web page. See archivePath above if link contains information about this."
->>>>>>> 4932ea6a3186d902d88c9bb5a3774c6ff81b1608
echo
echo "$identifier)"
echo " name=\"$name\""