Merge branch 'dev' into adibue-add-aldente

This commit is contained in:
Adrian Bühler
2021-06-22 11:30:16 +02:00
committed by GitHub
2 changed files with 20 additions and 79 deletions

View File

@@ -848,7 +848,6 @@ longversion)
expectedTeamID="2BUA8C4S2C"
blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" )
#forcefulQuit=YES
#Company="Agilebits"
;;
8x8)
# credit: #D-A-James from MacAdmins Slack and Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -858,7 +857,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"
@@ -866,7 +864,6 @@ 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)
@@ -896,9 +893,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"
@@ -923,7 +917,6 @@ 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"
@@ -940,7 +933,6 @@ alfred)
appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*Alfred_([0-9.]*)_.*/\1/')
appName="Alfred 4.app"
expectedTeamID="XZZXE9SED4"
#Company="Running with Crayons Ltd"
;;
amazonchime)
# credit: @dvsjr macadmins slack
@@ -949,7 +941,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)
@@ -971,7 +962,6 @@ apparency)
type="dmg"
downloadURL="https://www.mothersruin.com/software/downloads/Apparency.dmg"
expectedTeamID="936EB786NH"
#Company="Mother's Ruin Graphics"
;;
appcleaner)
# credit: Tadayuki Onishi (@kenchan0130)
@@ -979,7 +969,6 @@ 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"
@@ -1016,8 +1005,6 @@ aquaskk)
downloadURL=$(downloadURLFromGit codefirst aquaskk)
appNewVersion=$(versionFromGit codefirst aquaskk)
expectedTeamID="FPZK4WRGW7"
#Company="Code First"
#PatchSkip="YES"
;;
arq7)
name="Arq7"
@@ -1034,7 +1021,6 @@ atom)
downloadURL=$(downloadURLFromGit atom atom )
appNewVersion=$(versionFromGit atom atom)
expectedTeamID="VEKTX9H2N7"
#Company=GitHub
;;
autodmg)
# credit: Mischa van der Bent (@mischavdbent)
@@ -1043,7 +1029,6 @@ autodmg)
downloadURL=$(downloadURLFromGit MagerValp AutoDMG)
appNewVersion=$(versionFromGit MagerValp AutoDMG)
expectedTeamID="5KQ3D3FG5H"
#Company=MagerValp
;;
autopkgr)
# credit: Søren Theilgaard (@theilgaard)
@@ -1053,7 +1038,6 @@ autopkgr)
downloadURL=$(downloadURLFromGit lindegroup autopkgr)
appNewVersion=$(versionFromGit lindegroup autopkgr)
expectedTeamID="JVY2ZR6SEF"
#Company="Linde Group"
;;
aviatrix)
# credit: Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -1061,7 +1045,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)
@@ -1078,7 +1061,6 @@ 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)
@@ -1087,7 +1069,6 @@ balenaetcher)
downloadURL=$(downloadURLFromGit balena-io etcher )
appNewVersion=$(versionFromGit balena-io etcher )
expectedTeamID="66H43P8FRG"
#Company="Balena"
;;
basecamp3)
#credit: @matins
@@ -1103,7 +1084,6 @@ bbedit)
downloadURL=$(curl -s https://versioncheck.barebones.com/BBEdit.xml | grep dmg | sort | tail -n1 | cut -d">" -f2 | cut -d"<" -f1)
appNewVersion=$(curl -s https://versioncheck.barebones.com/BBEdit.xml | grep dmg | sort | tail -n1 | sed -E 's/.*BBEdit_([0-9 .]*)\.dmg.*/\1/')
expectedTeamID="W52GZAXT98"
#Company="Bare Bones Software"
;;
bettertouchtool)
# credit: Søren Theilgaard (@theilgaard)
@@ -1137,7 +1117,6 @@ bluejeans)
fi
appNewVersion=$(echo $downloadURL | cut -d '/' -f6)
expectedTeamID="HE4P42JBGN"
#Company="Verizon"
;;
boxdrive)
# credit: Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -1212,6 +1191,13 @@ clevershare2)
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"
@@ -1416,7 +1402,6 @@ figma)
type="zip"
downloadURL="https://www.figma.com/download/desktop/mac/"
expectedTeamID="T8RA8NE3B7"
#Company="Figma"
;;
firefox)
name="Firefox"
@@ -1517,12 +1502,15 @@ gimp)
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"
#Company="GIMP"
;;
githubdesktop)
name="GitHub Desktop"
type="zip"
downloadURL="https://central.github.com/deployments/desktop/desktop/latest/darwin"
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"
;;
@@ -1568,7 +1556,6 @@ googleearth)
type="pkgInDmg"
downloadURL="https://dl.google.com/earth/client/advanced/current/GoogleEarthProMac-Intel.dmg"
expectedTeamID="EQHXZ8M8AV"
#Company="Google"
;;
googledrive|\
googledrivefilestream)
@@ -1585,8 +1572,6 @@ googledrivebackupandsync)
type="dmg"
downloadURL="https://dl.google.com/drive/InstallBackupAndSync.dmg"
expectedTeamID="EQHXZ8M8AV"
#Company="Google"
#PatchSkip="YES"
;;
googlejapaneseinput)
# credit: Tadayuki Onishi (@kenchan0130)
@@ -1711,8 +1696,7 @@ inkscape)
#appNewVersion=$(curl -fsJL https://inkscape.org/release/ | grep "<h2>Inkscape" | cut -d '>' -f 3 | cut -d '<' -f 1 | sed 's/[^0-9.]*//g') # Can't figure out where exact new version is found. Currently returns 1.0, but version is "1.0.0 (4035a4f)"
expectedTeamID="SW3D6BB6A6"
;;
installomator_theile|\
installomator_st)
installomator_theile)
# credit: Søren Theilgaard (@theilgaard)
name="Installomator"
type="pkg"
@@ -1720,7 +1704,7 @@ installomator_st)
downloadURL=$(downloadURLFromGit theile Installomator )
appNewVersion=$(versionFromGit theile Installomator )
#appCustomVersion(){/usr/local/bin/Installomator.sh version | tail -1 | awk '{print $4}'}
expectedTeamID="L8W73B6AH3"
expectedTeamID="FXW6QXBFW5"
blockingProcesses=( NONE )
;;
istatmenus)
@@ -1753,8 +1737,6 @@ jamfconnect)
packageID="com.jamf.connect"
downloadURL="https://files.jamfconnect.com/JamfConnect.dmg"
expectedTeamID="483DWKW443"
#Company="Jamf"
#PatchSkip="YES"
;;
jamfmigrator)
# credit: Mischa van der Bent
@@ -1795,7 +1777,6 @@ intellijideace)
downloadURL="https://download.jetbrains.com/product?code=IIC&latest&distribution=mac"
appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=IIC&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3)
expectedTeamID="2ZEFAR8TH3"
#Company="JetBrains"
;;
jetbrainsphpstorm)
# credit: Casey Jensen (@cajenson01 on MacAdmins Slack)Appended by Skylar Damiano @catdad on MacAdmins Slack
@@ -1830,7 +1811,6 @@ pycharmce)
downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=macM1"
fi
expectedTeamID="2ZEFAR8TH3"
#Company="JetBrains"
;;
karabinerelements)
# credit: Tadayuki Onishi (@kenchan0130)
@@ -1990,7 +1970,6 @@ musescore)
downloadURL=$(downloadURLFromGit musescore MuseScore)
appNewVersion=$(versionFromGit musescore MuseScore)
expectedTeamID="6EPAF2X3PR"
#Company="Musescore"
;;
netnewswire)
name="NetNewsWire"
@@ -2220,7 +2199,6 @@ proctortrack)
type="zip"
downloadURL="https://storage.googleapis.com/verificientstatic/ProctortrackApp/Production/Proctortrack.zip"
expectedTeamID="SNHZD6TJE6"
#Company="Verificient Technologies"
;;
promiseutilityr)
name="Promise Utility"
@@ -2228,7 +2206,6 @@ promiseutilityr)
packageID="com.promise.utilinstaller"
downloadURL="https://www.promise.com/DownloadFile.aspx?DownloadFileUID=6533"
expectedTeamID="268CCUR4WN"
#Company="Promise"
;;
proxyman)
name="Proxyman"
@@ -2242,7 +2219,6 @@ pymol)
type="dmg"
downloadURL=$(curl -s -L "https://pymol.org/" | grep -m 1 -Eio 'href="https://pymol.org/installers/PyMOL-(.*)-MacOS(.*).dmg"' | cut -c7- | sed -e 's/"$//')
expectedTeamID="26SDDJ756N"
#Company="Schrödinger, Inc."
;;
r)
# credit: Tadayuki Onishi (@kenchan0130)
@@ -2294,8 +2270,6 @@ ricohpsprinters)
packageID="com.RICOH.print.PS_Printers_Vol4_EXP.ppds.pkg"
downloadURL=$(curl -fs https://support.ricoh.com//bb/html/dr_ut_e/rc3/model/mpc3004ex/mpc3004exen.htm | xmllint --html --format - 2>/dev/null | grep -m 1 -o "https://.*.dmg" | cut -d '"' -f 1)
expectedTeamID="5KACUT3YX8"
#Company="Ricoh"
#PatchSkip="YES"
;;
ringcentralapp)
# credit: Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -2312,7 +2286,6 @@ ringcentralclassicapp)
expectedTeamID="M932RC5J66"
blockingProcesses=( "Glip" )
#blockingProcessesMaxCPU="5"
#Company="RingCentral"
;;
ringcentralmeetings)
# credit: Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -2329,7 +2302,6 @@ ringcentralphone)
downloadURL="https://downloads.ringcentral.com/sp/RingCentralForMac"
expectedTeamID="M932RC5J66"
blockingProcesses=( "RingCentral Phone" )
#Company="RingCentral"
;;
rocket)
name="Rocket"
@@ -2358,7 +2330,6 @@ rstudio)
downloadURL=$(curl -s -L "https://rstudio.com/products/rstudio/download/" | grep -m 1 -Eio 'href="https://download1.rstudio.org/desktop/macos/RStudio-(.*).dmg"' | cut -c7- | sed -e 's/"$//')
appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
expectedTeamID="FYF2F5GFX4"
#Company="RStudio"
;;
santa)
# credit: Tadayuki Onishi (@kenchan0130)
@@ -2395,7 +2366,6 @@ sidekick)
downloadURL="https://api.meetsidekick.com/downloads/df/mac"
appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/.*-x64-([0-9.]*)-.*/\1/g' )
expectedTeamID="N975558CUS"
#Company="PushPlayLabs Inc."
;;
signal)
# credit: Søren Theilgaard (@theilgaard)
@@ -2436,7 +2406,6 @@ skype)
appNewVersion=$(curl -is "https://get.skype.com/go/getskype-skypeformac" | grep ocation: | grep -o "Skype-.*dmg" | cut -d "-" -f 2 | cut -d "." -f1-2)
expectedTeamID="AL798K98FX"
Company="Microsoft"
PatchSkip="YES"
;;
slack)
name="Slack"
@@ -2558,7 +2527,6 @@ teamviewerhost)
appNewVersion=$(curl -fs "https://www.teamviewer.com/en/download/mac-os/" | grep "Current version" | cut -d " " -f3 | cut -d "<" -f1)
expectedTeamID="H7UGFBUGV6"
#blockingProcessesMaxCPU="5" # Future feature
#Company="TeamViewer GmbH"
;;
teamviewerqs)
# credit: Søren Theilgaard (@theilgaard)
@@ -2661,20 +2629,12 @@ umbrellaroamingclient)
downloadURL=https://disthost.umbrella.com/roaming/upgrade/mac/production/$( curl -fsL https://disthost.umbrella.com/roaming/upgrade/mac/production/manifest.json | awk -F '"' '/"downloadFilename"/ { print $4 }' )
expectedTeamID="7P7HQ8H646"
;;
universaltypeclient)
name="Universal Type Client"
type="pkgInZip"
downloadURL=https://bin.extensis.com/$( curl -fs https://www.extensis.com/support/universal-type-server-7/ | grep -o "UTC-[0-9].*M.zip" )
expectedTeamID="J6MMHGD9D6"
Company="Extensis"
;;
universaltypeclient)
name="Universal Type Client"
type="pkgInZip"
#packageID="com.extensis.UniversalTypeClient.universalTypeClient70.Info.pkg" # Does not contain the real version of the download
downloadURL=https://bin.extensis.com/$( curl -fs https://www.extensis.com/support/universal-type-server-7/ | grep -o "UTC-[0-9].*M.zip" )
expectedTeamID="J6MMHGD9D6"
#Company="Extensis"
;;
vagrant)
# credit: AP Orlebeke (@apizz)
@@ -2838,15 +2798,12 @@ xeroxphaser7800)
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"
#Company=Xerox
#PatchSkip=YES
;;
zappy)
name="Zappy"
type="appInDmgInZip"
downloadURL="https://zappy.zapier.com/releases/zappy-latest.zip"
expectedTeamID="6LS97Q5E79"
#Company="Zapier"
;;
zoom)
# credit: Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -2866,8 +2823,6 @@ zoomclient)
#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"
#Company="Zoom Inc."
#PatchSkip="YES"
;;
zulujdk11)
name="Zulu JDK 11"
@@ -2881,8 +2836,6 @@ zulujdk11)
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
#Company="Azul"
#PatchSkip="YES"
;;
zulujdk13)
name="Zulu JDK 13"
@@ -2896,8 +2849,6 @@ zulujdk13)
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
#Company="Azul"
#PatchSkip="YES"
;;
zulujdk15)
name="Zulu JDK 15"
@@ -2911,13 +2862,12 @@ zulujdk15)
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
#Company="Azul"
#PatchSkip="YES"
;;
# MARK: Add new labels after this line (let us sort them in the list)
# MARK: add new labels above here
# MARK: Add new labels above here
#cdef)
# # cdef currently not signed
@@ -2996,14 +2946,6 @@ zulujdk15)
# expectedTeamID=""
# ;;
#wwdcformac)
# this label looks like software/site is gone
# name="WWDC"
# type="zip"
# downloadURL="https://cdn.wwdc.io/WWDC_latest.zip"
# expectedTeamID="8C7439RJLG"
# ;;
# MARK: Microsoft
@@ -3083,7 +3025,6 @@ microsoftlicenseremovaltool)
expectedTeamID="QGS93ZLCU7"
appNewVersion=$(curl -is "$downloadURL" | grep ocation: | grep -o "Microsoft_.*pkg" | cut -d "_" -f 5 | cut -d "." -f1-2)
Company="Microsoft"
PatchSkip="YES"
;;
microsoftoffice365)
name="MicrosoftOffice365"
@@ -3187,9 +3128,9 @@ microsoftteams)
# 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 )
# 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)

View File

@@ -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.