From 2e72b05df1309fe0a85421af0b9c00109ebd9f5b Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:55:28 +0200 Subject: [PATCH] finished updating labels --- fragments/arguments.sh | 20 ++++++++++++++++ fragments/functions.sh | 2 ++ fragments/labels/1password7.sh | 1 - fragments/labels/4kvideodownloader.sh | 8 +++++++ fragments/labels/8x8.sh | 1 - fragments/labels/abstract.sh | 1 - fragments/labels/adobebrackets.sh | 1 - fragments/labels/adobereaderdc.sh | 3 --- fragments/labels/airserver.sh | 1 - fragments/labels/aldente.sh | 7 ++++++ fragments/labels/alfred.sh | 1 - fragments/labels/alttab.sh | 7 ++++++ fragments/labels/amazonchime.sh | 1 - fragments/labels/anydesk.sh | 7 ++++++ fragments/labels/apparency.sh | 1 - fragments/labels/appcleaner.sh | 4 +--- fragments/labels/applenyfonts.sh | 7 ++++++ fragments/labels/applesfcompact.sh | 7 ++++++ fragments/labels/applesfmono.sh | 7 ++++++ fragments/labels/applesfpro.sh | 7 ++++++ fragments/labels/aquaskk.sh | 2 -- fragments/labels/arq7.sh | 8 +++++++ fragments/labels/atext.sh | 7 ++++++ fragments/labels/atom.sh | 1 - fragments/labels/audacity.sh | 8 +++++++ fragments/labels/autodmg.sh | 1 - fragments/labels/autopkgr.sh | 1 - fragments/labels/aviatrix.sh | 1 - fragments/labels/awsvpnclient.sh | 4 +--- fragments/labels/balenaetcher.sh | 2 -- fragments/labels/balsamiqwireframes.sh | 7 ++++++ fragments/labels/bartender.sh | 7 ++++++ fragments/labels/bbedit.sh | 1 - fragments/labels/bluejeans.sh | 7 ++++-- fragments/labels/brave.sh | 6 ++--- fragments/labels/caffeine.sh | 8 +++++++ fragments/labels/cakebrew.sh | 1 - fragments/labels/camostudio.sh | 2 +- fragments/labels/clevershare2.sh | 3 +-- fragments/labels/clickshare.sh | 7 ++++++ fragments/labels/dbeaverce.sh | 1 - fragments/labels/debookee.sh | 1 - fragments/labels/defaultfolderx.sh | 7 ++++++ fragments/labels/devonthink.sh | 7 ++---- fragments/labels/drift.sh | 7 ++++++ fragments/labels/easeusdatarecoverywizard.sh | 3 +-- fragments/labels/element.sh | 2 +- fragments/labels/evernote.sh | 8 +++++++ fragments/labels/favro.sh | 7 ++++++ fragments/labels/ferdi.sh | 1 - fragments/labels/figma.sh | 3 +-- fragments/labels/firefox_intl.sh | 23 ++++++++++++++++++ fragments/labels/firefoxesr.sh | 1 + fragments/labels/firefoxesr_intl.sh | 24 +++++++++++++++++++ fragments/labels/fsmonitor.sh | 1 - fragments/labels/gimp.sh | 1 - fragments/labels/githubdesktop.sh | 6 ++++- fragments/labels/golang.sh | 4 +--- fragments/labels/googledrivebackupandsync.sh | 2 -- fragments/labels/googleearth.sh | 1 - fragments/labels/googlejapaneseinput.sh | 1 + fragments/labels/googlesoftwareupdate.sh | 8 +++++++ fragments/labels/grasshopper.sh | 8 +++++++ fragments/labels/hancock.sh | 8 +++++++ fragments/labels/hazel.sh | 3 +-- fragments/labels/hyper.sh | 6 ++++- fragments/labels/imazingprofileeditor.sh | 7 ++++++ fragments/labels/installomator_theile.sh | 6 ++--- fragments/labels/jamfconnect.sh | 2 -- fragments/labels/jetbrainsintellijidea.sh | 2 +- fragments/labels/jetbrainsintellijideace.sh | 1 - fragments/labels/jetbrainspycharm.sh | 1 - fragments/labels/jetbrainspycharmce.sh | 1 - fragments/labels/keepassxc.sh | 8 +++++-- fragments/labels/keka.sh | 1 - fragments/labels/knockknock.sh | 3 +-- fragments/labels/lexarrecoverytool.sh | 3 +-- fragments/labels/logitechoptions.sh | 9 +++++++ fragments/labels/lulu.sh | 3 +-- fragments/labels/mattermost.sh | 5 ++++ fragments/labels/menumeters.sh | 1 - .../labels/microsoftlicenseremovaltool.sh | 1 - fragments/labels/microsoftteams.sh | 7 +++--- fragments/labels/microsoftvisualstudiocode.sh | 2 +- fragments/labels/musescore.sh | 1 - fragments/labels/nextcloud.sh | 3 ++- fragments/labels/notion.sh | 3 +-- fragments/labels/nvivo.sh | 3 +-- fragments/labels/obs.sh | 7 ++++++ fragments/labels/onionshare.sh | 3 +-- fragments/labels/onlyofficedesktop.sh | 1 - fragments/labels/opera.sh | 8 +++---- fragments/labels/plantronicshub.sh | 2 +- fragments/labels/postman.sh | 2 +- fragments/labels/proctortrack.sh | 1 - fragments/labels/promiseutilityr.sh | 1 - fragments/labels/proxyman.sh | 7 ++++++ fragments/labels/pymol.sh | 1 - fragments/labels/ramboxce.sh | 1 - fragments/labels/ricohpsprinters.sh | 2 -- fragments/labels/ringcentralclassicapp.sh | 1 - fragments/labels/ringcentralphone.sh | 1 - fragments/labels/rstudio.sh | 1 - fragments/labels/screenflick.sh | 7 ++++++ fragments/labels/sidekick.sh | 1 - fragments/labels/sirimote.sh | 7 ++++++ fragments/labels/sketch.sh | 1 - fragments/labels/slack.sh | 3 +-- fragments/labels/snapgeneviewer.sh | 3 +-- fragments/labels/sourcetree.sh | 6 ++--- fragments/labels/sublimetext.sh | 9 ++++--- fragments/labels/supportapp.sh | 9 +++++++ fragments/labels/tableaudesktop.sh | 7 ++++++ fragments/labels/teamviewer.sh | 2 ++ fragments/labels/teamviewerhost.sh | 2 +- fragments/labels/teamviewerqs.sh | 1 + fragments/labels/techsmithcapture.sh | 7 ++++++ fragments/labels/textexpander.sh | 7 ++++++ fragments/labels/theunarchiver.sh | 8 +++++++ fragments/labels/toggltrack.sh | 1 - fragments/labels/trex.sh | 8 +++++++ fragments/labels/uniconverter.sh | 7 ++++++ fragments/labels/universaltypeclient.sh | 1 - fragments/labels/vagrant.sh | 3 +-- fragments/labels/valuesfromarguments.sh | 18 -------------- fragments/labels/vanilla.sh | 1 - fragments/labels/veracrypt.sh | 3 +-- fragments/labels/vivaldi.sh | 4 +--- fragments/labels/webex.sh | 12 ++++++++++ fragments/labels/wickrme.sh | 3 +-- fragments/labels/wickrpro.sh | 3 +-- fragments/labels/wireshark.sh | 2 +- fragments/labels/wwdc.sh | 8 +++++++ fragments/labels/xeroxphaser7800.sh | 2 -- fragments/labels/xquartz.sh | 8 +++++++ fragments/labels/zappy.sh | 1 - fragments/labels/zoomclient.sh | 4 +--- fragments/labels/zoomrooms.sh | 9 +++++++ fragments/labels/zulujdk11.sh | 12 ++++------ fragments/labels/zulujdk13.sh | 12 ++++------ fragments/labels/zulujdk15.sh | 12 ++++------ utils/extractLabels.sh | 2 +- 142 files changed, 460 insertions(+), 190 deletions(-) create mode 100644 fragments/labels/4kvideodownloader.sh create mode 100644 fragments/labels/aldente.sh create mode 100644 fragments/labels/alttab.sh create mode 100644 fragments/labels/anydesk.sh create mode 100644 fragments/labels/applenyfonts.sh create mode 100644 fragments/labels/applesfcompact.sh create mode 100644 fragments/labels/applesfmono.sh create mode 100644 fragments/labels/applesfpro.sh create mode 100644 fragments/labels/arq7.sh create mode 100644 fragments/labels/atext.sh create mode 100644 fragments/labels/audacity.sh create mode 100644 fragments/labels/balsamiqwireframes.sh create mode 100644 fragments/labels/bartender.sh create mode 100644 fragments/labels/caffeine.sh create mode 100644 fragments/labels/clickshare.sh create mode 100644 fragments/labels/defaultfolderx.sh create mode 100644 fragments/labels/drift.sh create mode 100644 fragments/labels/evernote.sh create mode 100644 fragments/labels/favro.sh create mode 100644 fragments/labels/firefox_intl.sh create mode 100644 fragments/labels/firefoxesr_intl.sh create mode 100644 fragments/labels/googlesoftwareupdate.sh create mode 100644 fragments/labels/grasshopper.sh create mode 100644 fragments/labels/hancock.sh create mode 100644 fragments/labels/imazingprofileeditor.sh create mode 100644 fragments/labels/logitechoptions.sh create mode 100644 fragments/labels/obs.sh create mode 100644 fragments/labels/proxyman.sh create mode 100644 fragments/labels/screenflick.sh create mode 100644 fragments/labels/sirimote.sh create mode 100644 fragments/labels/supportapp.sh create mode 100644 fragments/labels/tableaudesktop.sh create mode 100644 fragments/labels/techsmithcapture.sh create mode 100644 fragments/labels/textexpander.sh create mode 100644 fragments/labels/theunarchiver.sh create mode 100644 fragments/labels/trex.sh create mode 100644 fragments/labels/uniconverter.sh delete mode 100644 fragments/labels/valuesfromarguments.sh create mode 100644 fragments/labels/webex.sh create mode 100644 fragments/labels/wwdc.sh create mode 100644 fragments/labels/xquartz.sh create mode 100644 fragments/labels/zoomrooms.sh diff --git a/fragments/arguments.sh b/fragments/arguments.sh index 8e6692f..4fca81e 100644 --- a/fragments/arguments.sh +++ b/fragments/arguments.sh @@ -59,3 +59,23 @@ longversion) printlog "Installomater: version $VERSION ($VERSIONDATE)" exit 0 ;; +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 + ;; + +# label descriptions start here diff --git a/fragments/functions.sh b/fragments/functions.sh index bd7b4a8..58da2df 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -605,3 +605,5 @@ finishing() { displaynotification "$message" "$name update/installation complete!" fi } + + diff --git a/fragments/labels/1password7.sh b/fragments/labels/1password7.sh index 6c1b6e4..f3ad253 100644 --- a/fragments/labels/1password7.sh +++ b/fragments/labels/1password7.sh @@ -6,5 +6,4 @@ expectedTeamID="2BUA8C4S2C" blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" ) #forcefulQuit=YES - #Company="Agilebits" ;; diff --git a/fragments/labels/4kvideodownloader.sh b/fragments/labels/4kvideodownloader.sh new file mode 100644 index 0000000..d05337f --- /dev/null +++ b/fragments/labels/4kvideodownloader.sh @@ -0,0 +1,8 @@ +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" + ;; diff --git a/fragments/labels/8x8.sh b/fragments/labels/8x8.sh index 468911b..904bcf0 100644 --- a/fragments/labels/8x8.sh +++ b/fragments/labels/8x8.sh @@ -6,5 +6,4 @@ # 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" ;; diff --git a/fragments/labels/abstract.sh b/fragments/labels/abstract.sh index 50f7648..ac43c07 100644 --- a/fragments/labels/abstract.sh +++ b/fragments/labels/abstract.sh @@ -4,5 +4,4 @@ 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" ;; diff --git a/fragments/labels/adobebrackets.sh b/fragments/labels/adobebrackets.sh index d58aaa6..85d97aa 100644 --- a/fragments/labels/adobebrackets.sh +++ b/fragments/labels/adobebrackets.sh @@ -1,5 +1,4 @@ adobebrackets) - # credit: Adrian Bühler (@midni9ht) name="Brackets" type="dmg" downloadURL=$(downloadURLFromGit adobe brackets ) diff --git a/fragments/labels/adobereaderdc.sh b/fragments/labels/adobereaderdc.sh index 6595a0f..881e69a 100644 --- a/fragments/labels/adobereaderdc.sh +++ b/fragments/labels/adobereaderdc.sh @@ -8,7 +8,4 @@ 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" ;; diff --git a/fragments/labels/airserver.sh b/fragments/labels/airserver.sh index 45e110e..8c1ede4 100644 --- a/fragments/labels/airserver.sh +++ b/fragments/labels/airserver.sh @@ -5,5 +5,4 @@ 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" ;; diff --git a/fragments/labels/aldente.sh b/fragments/labels/aldente.sh new file mode 100644 index 0000000..a7b49b4 --- /dev/null +++ b/fragments/labels/aldente.sh @@ -0,0 +1,7 @@ +aldente) + name="AlDente" + type="dmg" + downloadURL=$(downloadURLFromGit davidwernhart AlDente) + appNewVersion=$(versionFromGit davidwernhart AlDente) + expectedTeamID="3WVC84GB99" + ;; diff --git a/fragments/labels/alfred.sh b/fragments/labels/alfred.sh index 9854115..c0c9b50 100644 --- a/fragments/labels/alfred.sh +++ b/fragments/labels/alfred.sh @@ -6,5 +6,4 @@ alfred) appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*Alfred_([0-9.]*)_.*/\1/') appName="Alfred 4.app" expectedTeamID="XZZXE9SED4" - #Company="Running with Crayons Ltd" ;; diff --git a/fragments/labels/alttab.sh b/fragments/labels/alttab.sh new file mode 100644 index 0000000..bc3fbd4 --- /dev/null +++ b/fragments/labels/alttab.sh @@ -0,0 +1,7 @@ +alttab) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="AltTab" + type="zip" + downloadURL=$(downloadURLFromGit lwouis alt-tab-macos) + expectedTeamID="QXD7GW8FHY" + ;; diff --git a/fragments/labels/amazonchime.sh b/fragments/labels/amazonchime.sh index 4b49e0e..1961d2e 100644 --- a/fragments/labels/amazonchime.sh +++ b/fragments/labels/amazonchime.sh @@ -5,5 +5,4 @@ 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" ;; diff --git a/fragments/labels/anydesk.sh b/fragments/labels/anydesk.sh new file mode 100644 index 0000000..6a7c69f --- /dev/null +++ b/fragments/labels/anydesk.sh @@ -0,0 +1,7 @@ +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" + ;; diff --git a/fragments/labels/apparency.sh b/fragments/labels/apparency.sh index 7ea1a97..6ca5afb 100644 --- a/fragments/labels/apparency.sh +++ b/fragments/labels/apparency.sh @@ -3,5 +3,4 @@ apparency) type="dmg" downloadURL="https://www.mothersruin.com/software/downloads/Apparency.dmg" expectedTeamID="936EB786NH" - #Company="Mother's Ruin Graphics" ;; diff --git a/fragments/labels/appcleaner.sh b/fragments/labels/appcleaner.sh index ac92494..6e19a8e 100644 --- a/fragments/labels/appcleaner.sh +++ b/fragments/labels/appcleaner.sh @@ -2,8 +2,6 @@ appcleaner) # credit: Tadayuki Onishi (@kenchan0130) name="AppCleaner" type="zip" - downloadURL=$(curl -fs https://freemacsoft.net/appcleaner/Updates.xml | xpath '//rss/channel/*/enclosure/@url' 2>/dev/null | tr " " " -" | sort | tail -1 | cut -d '"' -f 2) + 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 ;; diff --git a/fragments/labels/applenyfonts.sh b/fragments/labels/applenyfonts.sh new file mode 100644 index 0000000..336dd48 --- /dev/null +++ b/fragments/labels/applenyfonts.sh @@ -0,0 +1,7 @@ +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" + ;; diff --git a/fragments/labels/applesfcompact.sh b/fragments/labels/applesfcompact.sh new file mode 100644 index 0000000..d32d6f2 --- /dev/null +++ b/fragments/labels/applesfcompact.sh @@ -0,0 +1,7 @@ +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" + ;; diff --git a/fragments/labels/applesfmono.sh b/fragments/labels/applesfmono.sh new file mode 100644 index 0000000..46c32a7 --- /dev/null +++ b/fragments/labels/applesfmono.sh @@ -0,0 +1,7 @@ +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" + ;; diff --git a/fragments/labels/applesfpro.sh b/fragments/labels/applesfpro.sh new file mode 100644 index 0000000..5c7deaa --- /dev/null +++ b/fragments/labels/applesfpro.sh @@ -0,0 +1,7 @@ +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" + ;; diff --git a/fragments/labels/aquaskk.sh b/fragments/labels/aquaskk.sh index d79cf71..7faa1ff 100644 --- a/fragments/labels/aquaskk.sh +++ b/fragments/labels/aquaskk.sh @@ -5,6 +5,4 @@ aquaskk) downloadURL=$(downloadURLFromGit codefirst aquaskk) appNewVersion=$(versionFromGit codefirst aquaskk) expectedTeamID="FPZK4WRGW7" - #Company="Code First" - #PatchSkip="YES" ;; diff --git a/fragments/labels/arq7.sh b/fragments/labels/arq7.sh new file mode 100644 index 0000000..d00b9b2 --- /dev/null +++ b/fragments/labels/arq7.sh @@ -0,0 +1,8 @@ +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" + ;; diff --git a/fragments/labels/atext.sh b/fragments/labels/atext.sh new file mode 100644 index 0000000..0bdc49e --- /dev/null +++ b/fragments/labels/atext.sh @@ -0,0 +1,7 @@ +atext) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="aText" + type="dmg" + downloadURL="https://trankynam.com/atext/downloads/aText.dmg" + expectedTeamID="KHEMQ2FD9E" + ;; diff --git a/fragments/labels/atom.sh b/fragments/labels/atom.sh index 642ca93..0ab4c2a 100644 --- a/fragments/labels/atom.sh +++ b/fragments/labels/atom.sh @@ -5,5 +5,4 @@ atom) downloadURL=$(downloadURLFromGit atom atom ) appNewVersion=$(versionFromGit atom atom) expectedTeamID="VEKTX9H2N7" - #Company=GitHub ;; diff --git a/fragments/labels/audacity.sh b/fragments/labels/audacity.sh new file mode 100644 index 0000000..89c17fe --- /dev/null +++ b/fragments/labels/audacity.sh @@ -0,0 +1,8 @@ +audacity) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="Audacity" + type="dmg" + downloadURL=$(downloadURLFromGit audacity audacity) + appNewVersion=$(versionFromGit audacity audacity) + expectedTeamID="T3N4JQ7YY6" + ;; diff --git a/fragments/labels/autodmg.sh b/fragments/labels/autodmg.sh index 3602034..6763027 100644 --- a/fragments/labels/autodmg.sh +++ b/fragments/labels/autodmg.sh @@ -5,5 +5,4 @@ autodmg) downloadURL=$(downloadURLFromGit MagerValp AutoDMG) appNewVersion=$(versionFromGit MagerValp AutoDMG) expectedTeamID="5KQ3D3FG5H" - #Company=MagerValp ;; diff --git a/fragments/labels/autopkgr.sh b/fragments/labels/autopkgr.sh index fd18068..2937f08 100644 --- a/fragments/labels/autopkgr.sh +++ b/fragments/labels/autopkgr.sh @@ -6,5 +6,4 @@ autopkgr) downloadURL=$(downloadURLFromGit lindegroup autopkgr) appNewVersion=$(versionFromGit lindegroup autopkgr) expectedTeamID="JVY2ZR6SEF" - #Company="Linde Group" ;; diff --git a/fragments/labels/aviatrix.sh b/fragments/labels/aviatrix.sh index d223adc..ab72ee1 100644 --- a/fragments/labels/aviatrix.sh +++ b/fragments/labels/aviatrix.sh @@ -4,5 +4,4 @@ aviatrix) type="pkg" downloadURL="https://s3-us-west-2.amazonaws.com/aviatrix-download/AviatrixVPNClient/AVPNC_mac.pkg" expectedTeamID="32953Z7NBN" - #Company=Aviatrix ;; diff --git a/fragments/labels/awsvpnclient.sh b/fragments/labels/awsvpnclient.sh index 9e1abb5..dbc4885 100644 --- a/fragments/labels/awsvpnclient.sh +++ b/fragments/labels/awsvpnclient.sh @@ -3,7 +3,5 @@ awsvpnclient) type="pkg" 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 ',' ' -' | grep currentVersion | cut -d '"' -f 4) - #Company=Amazon + appNewVersion=$(curl -is "https://beta2.communitypatch.com/jamf/v1/ba1efae22ae74a9eb4e915c31fef5dd2/patch/AWSVPNClient" | grep currentVersion | tr ',' '\n' | grep currentVersion | cut -d '"' -f 4) ;; diff --git a/fragments/labels/balenaetcher.sh b/fragments/labels/balenaetcher.sh index fef6381..ae7feef 100644 --- a/fragments/labels/balenaetcher.sh +++ b/fragments/labels/balenaetcher.sh @@ -1,9 +1,7 @@ balenaetcher) - # credit: Adrian Bühler (@midni9ht) name="balenaEtcher" type="dmg" downloadURL=$(downloadURLFromGit balena-io etcher ) appNewVersion=$(versionFromGit balena-io etcher ) expectedTeamID="66H43P8FRG" - #Company="Balena" ;; diff --git a/fragments/labels/balsamiqwireframes.sh b/fragments/labels/balsamiqwireframes.sh new file mode 100644 index 0000000..7df4b4e --- /dev/null +++ b/fragments/labels/balsamiqwireframes.sh @@ -0,0 +1,7 @@ +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 "bwd/" "/dmg/ {print \$3}" | awk -F "" "{print \$1}" | sed "s/ /%20/g") + expectedTeamID="3DPKD72KQ7" + ;; diff --git a/fragments/labels/bartender.sh b/fragments/labels/bartender.sh new file mode 100644 index 0000000..9330c2b --- /dev/null +++ b/fragments/labels/bartender.sh @@ -0,0 +1,7 @@ +bartender) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="Bartender 4" + type="dmg" + downloadURL="https://www.macbartender.com/B2/updates/B4Latest/Bartender%204.dmg" + expectedTeamID="8DD663WDX4" + ;; diff --git a/fragments/labels/bbedit.sh b/fragments/labels/bbedit.sh index 868481c..2eb3ff1 100644 --- a/fragments/labels/bbedit.sh +++ b/fragments/labels/bbedit.sh @@ -4,5 +4,4 @@ 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" ;; diff --git a/fragments/labels/bluejeans.sh b/fragments/labels/bluejeans.sh index c9c79a1..d3d878a 100644 --- a/fragments/labels/bluejeans.sh +++ b/fragments/labels/bluejeans.sh @@ -1,8 +1,11 @@ bluejeans) name="BlueJeans" type="pkg" - downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.dmg" | sed 's/dmg/pkg/g') + if [[ $(arch) == "arm64" ]]; then + downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.*arm.*.pkg" ) + elif [[ $(arch) == "i386" ]]; then + downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.*x86.*.dmg" | sed 's/dmg/pkg/g') + fi appNewVersion=$(echo $downloadURL | cut -d '/' -f6) expectedTeamID="HE4P42JBGN" - #Company="Verizon" ;; diff --git a/fragments/labels/brave.sh b/fragments/labels/brave.sh index 9d80ee7..44a3e90 100644 --- a/fragments/labels/brave.sh +++ b/fragments/labels/brave.sh @@ -4,12 +4,10 @@ brave) type="dmg" if [[ $(arch) != "i386" ]]; then printlog "Architecture: arm64 (not i386)" - downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osxarm64/release | grep -i "^location" | awk '{print $2}' | tr -d ' -') + downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osxarm64/release | grep -i "^location" | awk '{print $2}' | tr -d '\r\n') else printlog "Architecture: i386" - downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osx/release | grep -i "^location" | awk '{print $2}' | tr -d ' -') + downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osx/release | grep -i "^location" | awk '{print $2}' | tr -d '\r\n') fi # downloadURL=$(curl --location --fail --silent "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2) appNewVersion=$(curl --location --fail --silent "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f 2) diff --git a/fragments/labels/caffeine.sh b/fragments/labels/caffeine.sh new file mode 100644 index 0000000..a97e615 --- /dev/null +++ b/fragments/labels/caffeine.sh @@ -0,0 +1,8 @@ +caffeine) + name="Caffeine" + type="dmg" + downloadURL=$(downloadURLFromGit IntelliScape caffeine) + appNewVersion=$(versionFromGit IntelliScape caffeine) + expectedTeamID="YD6LEYT6WZ" + blockingProcesses=( Caffeine ) + ;; diff --git a/fragments/labels/cakebrew.sh b/fragments/labels/cakebrew.sh index 0ac1f80..9fada87 100644 --- a/fragments/labels/cakebrew.sh +++ b/fragments/labels/cakebrew.sh @@ -1,5 +1,4 @@ cakebrew) - # credit: Adrian Bühler (@midni9ht) name="Cakebrew" type="zip" downloadURL=$(curl -fsL "https://www.cakebrew.com/appcast/profileInfo.php" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2) diff --git a/fragments/labels/camostudio.sh b/fragments/labels/camostudio.sh index 1583afb..71b2646 100644 --- a/fragments/labels/camostudio.sh +++ b/fragments/labels/camostudio.sh @@ -3,6 +3,6 @@ camostudio) name="Camo Studio" type="zip" downloadURL="https://reincubate.com/res/labs/camo/camo-macos-latest.zip" - #appNewVersion=$( ) # Can't find any versioniing on web server + appNewVersion=$(curl -s -L https://reincubate.com/support/camo/release-notes/ | grep -m2 "has-m-t-0" | head -1 | cut -d ">" -f2 | cut -d " " -f1) expectedTeamID="Q248YREB53" ;; diff --git a/fragments/labels/clevershare2.sh b/fragments/labels/clevershare2.sh index fec222e..0429a17 100644 --- a/fragments/labels/clevershare2.sh +++ b/fragments/labels/clevershare2.sh @@ -2,8 +2,7 @@ clevershare2) # credit: Søren Theilgaard (@theilgaard) name="Clevershare" type="dmg" - downloadURL=$(curl -fs https://archive.clevertouch.com/clevershare2g | grep -i "_Mac" | tr '"' " -" | grep "^http.*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" ;; diff --git a/fragments/labels/clickshare.sh b/fragments/labels/clickshare.sh new file mode 100644 index 0000000..6911551 --- /dev/null +++ b/fragments/labels/clickshare.sh @@ -0,0 +1,7 @@ +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" + ;; diff --git a/fragments/labels/dbeaverce.sh b/fragments/labels/dbeaverce.sh index ac29718..120f0ad 100644 --- a/fragments/labels/dbeaverce.sh +++ b/fragments/labels/dbeaverce.sh @@ -1,5 +1,4 @@ dbeaverce) - # credit: Adrian Bühler (@midni9ht) name="DBeaver" type="dmg" downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos.dmg" diff --git a/fragments/labels/debookee.sh b/fragments/labels/debookee.sh index 598c9c2..1c0b1fa 100644 --- a/fragments/labels/debookee.sh +++ b/fragments/labels/debookee.sh @@ -1,5 +1,4 @@ debookee) - # credit: Adrian Bühler (@midni9ht) 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) diff --git a/fragments/labels/defaultfolderx.sh b/fragments/labels/defaultfolderx.sh new file mode 100644 index 0000000..d9f3fa9 --- /dev/null +++ b/fragments/labels/defaultfolderx.sh @@ -0,0 +1,7 @@ +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" + ;; diff --git a/fragments/labels/devonthink.sh b/fragments/labels/devonthink.sh index 62f5ab9..85d3d42 100644 --- a/fragments/labels/devonthink.sh +++ b/fragments/labels/devonthink.sh @@ -3,10 +3,7 @@ devonthink) # credit: Søren Theilgaard (@theilgaard) name="DEVONthink 3" type="appInDmgInZip" - downloadURL=$( curl -fs https://www.devontechnologies.com/apps/devonthink | grep -i "download.devon" | tr '"' ' -' | tr "'" ' -' | grep -e '^https://' ) - appNewVersion=$( echo ${downloadURL} | tr '/' ' -' | grep "[0-9]" | grep "[.]" | head -1 ) + 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" ;; diff --git a/fragments/labels/drift.sh b/fragments/labels/drift.sh new file mode 100644 index 0000000..0f02ffc --- /dev/null +++ b/fragments/labels/drift.sh @@ -0,0 +1,7 @@ +drift) + # credit Elena Ackley (@elenaelago) + name="Drift" + type="dmg" + downloadURL="https://drift-prod-desktop-installers.s3.amazonaws.com/mac/Drift-latest.dmg" + expectedTeamID="78559WUUR9" + ;; diff --git a/fragments/labels/easeusdatarecoverywizard.sh b/fragments/labels/easeusdatarecoverywizard.sh index b16ae92..0647a99 100644 --- a/fragments/labels/easeusdatarecoverywizard.sh +++ b/fragments/labels/easeusdatarecoverywizard.sh @@ -2,8 +2,7 @@ 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 ' -' ) + 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" ;; diff --git a/fragments/labels/element.sh b/fragments/labels/element.sh index 3507355..c672a93 100644 --- a/fragments/labels/element.sh +++ b/fragments/labels/element.sh @@ -1,7 +1,7 @@ element) - # credit: Adrian Bühler (@midni9ht) name="Element" type="dmg" downloadURL="https://packages.riot.im/desktop/install/macos/Element.dmg" + appNewVersion=$(versionFromGit vector-im element-desktop) expectedTeamID="7J4U792NQT" ;; diff --git a/fragments/labels/evernote.sh b/fragments/labels/evernote.sh new file mode 100644 index 0000000..85253e6 --- /dev/null +++ b/fragments/labels/evernote.sh @@ -0,0 +1,8 @@ +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" + ;; diff --git a/fragments/labels/favro.sh b/fragments/labels/favro.sh new file mode 100644 index 0000000..0729b36 --- /dev/null +++ b/fragments/labels/favro.sh @@ -0,0 +1,7 @@ +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" + ;; diff --git a/fragments/labels/ferdi.sh b/fragments/labels/ferdi.sh index 2086709..6aaa7ed 100644 --- a/fragments/labels/ferdi.sh +++ b/fragments/labels/ferdi.sh @@ -1,5 +1,4 @@ ferdi) - # credit: Adrian Bühler (@midni9ht) name="Ferdi" type="dmg" downloadURL=$(downloadURLFromGit getferdi ferdi ) diff --git a/fragments/labels/figma.sh b/fragments/labels/figma.sh index 8a0ab8d..5ebaaf6 100644 --- a/fragments/labels/figma.sh +++ b/fragments/labels/figma.sh @@ -1,7 +1,6 @@ figma) name="Figma" type="zip" - downloadURL="https://www.figma.com/download/desktop/mac/" + downloadURL="https://desktop.figma.com/mac/Figma.zip" expectedTeamID="T8RA8NE3B7" - #Company="Figma" ;; diff --git a/fragments/labels/firefox_intl.sh b/fragments/labels/firefox_intl.sh new file mode 100644 index 0000000..2ff94a8 --- /dev/null +++ b/fragments/labels/firefox_intl.sh @@ -0,0 +1,23 @@ +firefox_intl) + # This label will try to figure out the selected language of the user, + # and install corrosponding version of Firefox + name="Firefox" + type="dmg" + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale) + printlog "Found language $userLanguage to be used for Firefox." + if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then + userLanguage=$(echo $userLanguage | cut -c 1-2) + if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then + userLanguage="en_US" + fi + fi + printlog "Using language $userLanguage for download." + downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=$userLanguage" + if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then + printlog "Download not found for that language. Using en-US" + downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US" + fi + appNewVersion=$(/usr/bin/curl -sl https://www.mozilla.org/en-US/firefox/releases/ | /usr/bin/grep '/dev/null | cut -d '"' -f 2) diff --git a/fragments/labels/gimp.sh b/fragments/labels/gimp.sh index abea892..bea3c31 100644 --- a/fragments/labels/gimp.sh +++ b/fragments/labels/gimp.sh @@ -4,5 +4,4 @@ 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" ;; diff --git a/fragments/labels/githubdesktop.sh b/fragments/labels/githubdesktop.sh index 8628796..f52bb4e 100644 --- a/fragments/labels/githubdesktop.sh +++ b/fragments/labels/githubdesktop.sh @@ -1,7 +1,11 @@ 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" ;; diff --git a/fragments/labels/golang.sh b/fragments/labels/golang.sh index c7642c8..81b81f9 100644 --- a/fragments/labels/golang.sh +++ b/fragments/labels/golang.sh @@ -3,9 +3,7 @@ golang) 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 '"' ' -' | grep "pkg")" | grep -i "^location" | awk '{print $2}' | tr -d ' -')" + 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 ) diff --git a/fragments/labels/googledrivebackupandsync.sh b/fragments/labels/googledrivebackupandsync.sh index 99d5cca..2314d65 100644 --- a/fragments/labels/googledrivebackupandsync.sh +++ b/fragments/labels/googledrivebackupandsync.sh @@ -3,6 +3,4 @@ googledrivebackupandsync) type="dmg" downloadURL="https://dl.google.com/drive/InstallBackupAndSync.dmg" expectedTeamID="EQHXZ8M8AV" - #Company="Google" - #PatchSkip="YES" ;; diff --git a/fragments/labels/googleearth.sh b/fragments/labels/googleearth.sh index 33bbff0..f27afd4 100644 --- a/fragments/labels/googleearth.sh +++ b/fragments/labels/googleearth.sh @@ -3,5 +3,4 @@ googleearth) type="pkgInDmg" downloadURL="https://dl.google.com/earth/client/advanced/current/GoogleEarthProMac-Intel.dmg" expectedTeamID="EQHXZ8M8AV" - #Company="Google" ;; diff --git a/fragments/labels/googlejapaneseinput.sh b/fragments/labels/googlejapaneseinput.sh index e383105..193acbf 100644 --- a/fragments/labels/googlejapaneseinput.sh +++ b/fragments/labels/googlejapaneseinput.sh @@ -4,5 +4,6 @@ googlejapaneseinput) type="pkgInDmg" pkgName="GoogleJapaneseInput.pkg" downloadURL="https://dl.google.com/japanese-ime/latest/GoogleJapaneseInput.dmg" + blockingProcesses=( NONE ) expectedTeamID="EQHXZ8M8AV" ;; diff --git a/fragments/labels/googlesoftwareupdate.sh b/fragments/labels/googlesoftwareupdate.sh new file mode 100644 index 0000000..d48f9b7 --- /dev/null +++ b/fragments/labels/googlesoftwareupdate.sh @@ -0,0 +1,8 @@ +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" + ;; diff --git a/fragments/labels/grasshopper.sh b/fragments/labels/grasshopper.sh new file mode 100644 index 0000000..da10eb6 --- /dev/null +++ b/fragments/labels/grasshopper.sh @@ -0,0 +1,8 @@ +grasshopper) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="Grasshopper" + type="dmg" + downloadURL="https://dl.grasshopper.com/Grasshopper.dmg" + pkgName="Grasshopper.dmg" + expectedTeamID="KD6L2PTK2Q" + ;; diff --git a/fragments/labels/hancock.sh b/fragments/labels/hancock.sh new file mode 100644 index 0000000..756e0f3 --- /dev/null +++ b/fragments/labels/hancock.sh @@ -0,0 +1,8 @@ +hancock) + # Credit: Bilal Habib @Pro4TLZZZ + name="Hancock" + type="dmg" + downloadURL=$(downloadURLFromGit JeremyAgost Hancock ) + appNewVersion=$(versionFromGit JeremyAgost Hancock ) + expectedTeamID="SWD2B88S58" + ;; diff --git a/fragments/labels/hazel.sh b/fragments/labels/hazel.sh index f0294ed..9fccc13 100644 --- a/fragments/labels/hazel.sh +++ b/fragments/labels/hazel.sh @@ -2,8 +2,7 @@ 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 ' -') + 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" ;; diff --git a/fragments/labels/hyper.sh b/fragments/labels/hyper.sh index 321883d..7bfa95a 100644 --- a/fragments/labels/hyper.sh +++ b/fragments/labels/hyper.sh @@ -1,7 +1,11 @@ hyper) - # credit: Adrian Bühler (@midni9ht) 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" diff --git a/fragments/labels/imazingprofileeditor.sh b/fragments/labels/imazingprofileeditor.sh new file mode 100644 index 0000000..c636c1e --- /dev/null +++ b/fragments/labels/imazingprofileeditor.sh @@ -0,0 +1,7 @@ +imazingprofileeditor) + # Credit: Bilal Habib @Pro4TLZZZ + name="iMazing Profile Editor" + type="dmg" + downloadURL="https://downloads.imazing.com/mac/iMazing-Profile-Editor/iMazingProfileEditorMac.dmg" + expectedTeamID="J5PR93692Y" + ;; diff --git a/fragments/labels/installomator_theile.sh b/fragments/labels/installomator_theile.sh index 210f8d4..e531055 100644 --- a/fragments/labels/installomator_theile.sh +++ b/fragments/labels/installomator_theile.sh @@ -1,11 +1,11 @@ -installomator_theile|\ -installomator_st) +installomator_theile) # credit: Søren Theilgaard (@theilgaard) name="Installomator" type="pkg" packageID="dk.theilgaard.pkg.Installomator" downloadURL=$(downloadURLFromGit theile Installomator ) appNewVersion=$(versionFromGit theile Installomator ) - expectedTeamID="L8W73B6AH3" + #appCustomVersion(){/usr/local/bin/Installomator.sh version | tail -1 | awk '{print $4}'} + expectedTeamID="FXW6QXBFW5" blockingProcesses=( NONE ) ;; diff --git a/fragments/labels/jamfconnect.sh b/fragments/labels/jamfconnect.sh index e2b79c4..81d401c 100644 --- a/fragments/labels/jamfconnect.sh +++ b/fragments/labels/jamfconnect.sh @@ -4,6 +4,4 @@ jamfconnect) packageID="com.jamf.connect" downloadURL="https://files.jamfconnect.com/JamfConnect.dmg" expectedTeamID="483DWKW443" - #Company="Jamf" - #PatchSkip="YES" ;; diff --git a/fragments/labels/jetbrainsintellijidea.sh b/fragments/labels/jetbrainsintellijidea.sh index 9af48ee..eeb92b2 100644 --- a/fragments/labels/jetbrainsintellijidea.sh +++ b/fragments/labels/jetbrainsintellijidea.sh @@ -1,5 +1,5 @@ jetbrainsintellijidea) - # credit: Gabe Marchan (www.gabemarchan.com) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) name="IntelliJ IDEA" type="dmg" downloadURL="https://download.jetbrains.com/product?code=II&latest&distribution=mac" diff --git a/fragments/labels/jetbrainsintellijideace.sh b/fragments/labels/jetbrainsintellijideace.sh index 1859598..6f0358c 100644 --- a/fragments/labels/jetbrainsintellijideace.sh +++ b/fragments/labels/jetbrainsintellijideace.sh @@ -5,5 +5,4 @@ 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" ;; diff --git a/fragments/labels/jetbrainspycharm.sh b/fragments/labels/jetbrainspycharm.sh index bb90a23..74f2e7d 100644 --- a/fragments/labels/jetbrainspycharm.sh +++ b/fragments/labels/jetbrainspycharm.sh @@ -1,5 +1,4 @@ jetbrainspycharm) - # credit: Adrian Bühler (@midni9ht) # This is the Pro version of PyCharm. # Do not confuse with PyCharm CE. name="PyCharm" diff --git a/fragments/labels/jetbrainspycharmce.sh b/fragments/labels/jetbrainspycharmce.sh index 1fc2223..c135c82 100644 --- a/fragments/labels/jetbrainspycharmce.sh +++ b/fragments/labels/jetbrainspycharmce.sh @@ -9,5 +9,4 @@ pycharmce) downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=macM1" fi expectedTeamID="2ZEFAR8TH3" - #Company="JetBrains" ;; diff --git a/fragments/labels/keepassxc.sh b/fragments/labels/keepassxc.sh index e532a7a..47e3e9d 100644 --- a/fragments/labels/keepassxc.sh +++ b/fragments/labels/keepassxc.sh @@ -1,8 +1,12 @@ keepassxc) - # credit: Patrick Atoon (@raptor399) name="KeePassXC" type="dmg" - downloadURL="$(downloadURLFromGit keepassxreboot keepassxc)" + if [[ $(arch) == i386 ]]; then + archiveName="x86_64.dmg" + elif [[ $(arch) == arm64 ]]; then + archiveName="arm64.dmg" + fi + downloadURL=$(downloadURLFromGit keepassxreboot keepassxc) appNewVersion=$(versionFromGit keepassxreboot keepassxc) expectedTeamID="G2S7P7J672" ;; diff --git a/fragments/labels/keka.sh b/fragments/labels/keka.sh index e41d1c2..58ecf7a 100644 --- a/fragments/labels/keka.sh +++ b/fragments/labels/keka.sh @@ -1,5 +1,4 @@ keka) - # credit: Adrian Bühler (@midni9ht) name="Keka" type="dmg" downloadURL=$(downloadURLFromGit aonez Keka) diff --git a/fragments/labels/knockknock.sh b/fragments/labels/knockknock.sh index 95361af..8f351f4 100644 --- a/fragments/labels/knockknock.sh +++ b/fragments/labels/knockknock.sh @@ -1,8 +1,7 @@ knockknock) name="KnockKnock" type="zip" - downloadURL=$( curl -fs "https://objective-see.com/products/knockknock.html" | grep https | grep "$type" | head -1 | tr '"' " -" | grep "^http" ) + downloadURL=$( curl -fs "https://objective-see.com/products/knockknock.html" | grep https | grep "$type" | head -1 | tr '"' "\n" | grep "^http" ) appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*)\..*/\1/g' ) expectedTeamID="VBG97UB4TA" ;; diff --git a/fragments/labels/lexarrecoverytool.sh b/fragments/labels/lexarrecoverytool.sh index 62c405b..82816e8 100644 --- a/fragments/labels/lexarrecoverytool.sh +++ b/fragments/labels/lexarrecoverytool.sh @@ -2,8 +2,7 @@ lexarrecoverytool) # credit: Søren Theilgaard (@theilgaard) name="Lexar Recovery Tool" type="appInDmgInZip" - downloadURL="https://www.lexar.com$( curl -fs "https://www.lexar.com/support/downloads/" | grep -i "mac" | grep -i "recovery" | head -1 | tr '"' ' -' | grep -i ".zip" )" + downloadURL="https://www.lexar.com$( curl -fs "https://www.lexar.com/support/downloads/" | grep -i "mac" | grep -i "recovery" | head -1 | tr '"' '\n' | grep -i ".zip" )" #appNewVersion="" expectedTeamID="Y8HM6WR2DV" ;; diff --git a/fragments/labels/logitechoptions.sh b/fragments/labels/logitechoptions.sh new file mode 100644 index 0000000..bcb32a6 --- /dev/null +++ b/fragments/labels/logitechoptions.sh @@ -0,0 +1,9 @@ +logitechoptions) + # credit: AP Orlebeke (@apizz) + name="Logitech Options" + type="pkgInZip" + downloadURL=$(curl -fs -L https://www.logitech.com/en-us/product/options | grep -m 1 -o "https.*zip" | sed 's/\"//' | awk '{print $1}') + appNewVersion=$(curl -fs -L https://www.logitech.com/en-us/product/options | grep -m 1 -o "https.*zip" | sed 's/\"//' | awk '{print $1}' | sed -E 's/.*_([0-9\.]*)[-\.].*/\1/' ) + pkgName="LogiMgr Installer ${appNewVersion}.app/Contents/Resources/LogiMgr.pkg" + expectedTeamID="QED4VVPZWA" + ;; diff --git a/fragments/labels/lulu.sh b/fragments/labels/lulu.sh index c4814d5..72014ee 100644 --- a/fragments/labels/lulu.sh +++ b/fragments/labels/lulu.sh @@ -1,8 +1,7 @@ lulu) name="LuLu" type="dmg" - downloadURL=$( curl -fs "https://objective-see.com/products/lulu.html" | grep https | grep "$type" | head -1 | tr '"' " -" | grep "^http" ) + downloadURL=$( curl -fs "https://objective-see.com/products/lulu.html" | grep https | grep "$type" | head -1 | tr '"' "\n" | grep "^http" ) appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*)\..*/\1/g' ) expectedTeamID="VBG97UB4TA" ;; diff --git a/fragments/labels/mattermost.sh b/fragments/labels/mattermost.sh index 1f5b6ac..86cd707 100644 --- a/fragments/labels/mattermost.sh +++ b/fragments/labels/mattermost.sh @@ -1,6 +1,11 @@ mattermost) name="Mattermost" type="dmg" + if [[ $(arch) == i386 ]]; then + archiveName="mac.dmg" + elif [[ $(arch) == arm64 ]]; then + archiveName="mac-m1.dmg" + fi downloadURL=$(downloadURLFromGit mattermost desktop) appNewVersion=$(versionFromGit mattermost desktop ) expectedTeamID="UQ8HT4Q2XM" diff --git a/fragments/labels/menumeters.sh b/fragments/labels/menumeters.sh index 25c8f78..5eadf41 100644 --- a/fragments/labels/menumeters.sh +++ b/fragments/labels/menumeters.sh @@ -1,5 +1,4 @@ menumeters) - # credit: Adrian Bühler (@midni9ht) name="MenuMeters" type="zip" downloadURL=$(downloadURLFromGit yujitach MenuMeters ) diff --git a/fragments/labels/microsoftlicenseremovaltool.sh b/fragments/labels/microsoftlicenseremovaltool.sh index 039d43b..60242dd 100644 --- a/fragments/labels/microsoftlicenseremovaltool.sh +++ b/fragments/labels/microsoftlicenseremovaltool.sh @@ -6,5 +6,4 @@ 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" ;; diff --git a/fragments/labels/microsoftteams.sh b/fragments/labels/microsoftteams.sh index 3b0c47c..e0385d8 100644 --- a/fragments/labels/microsoftteams.sh +++ b/fragments/labels/microsoftteams.sh @@ -3,10 +3,11 @@ microsoftteams) 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/') + #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" ) - 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 ) ;; diff --git a/fragments/labels/microsoftvisualstudiocode.sh b/fragments/labels/microsoftvisualstudiocode.sh index 02066b6..85a4e68 100644 --- a/fragments/labels/microsoftvisualstudiocode.sh +++ b/fragments/labels/microsoftvisualstudiocode.sh @@ -7,5 +7,5 @@ visualstudiocode) appNewVersion=$(curl -fsL "https://code.visualstudio.com/Updates" | grep "/darwin" | grep -oiE ".com/([^>]+)([^<]+)/darwin" | cut -d "/" -f 2 | sed $'s/[^[:print:] ]//g' | head -1 ) expectedTeamID="UBF8T346G9" appName="Visual Studio Code.app" - blockingProcesses=( Electron ) + blockingProcesses=( Code ) ;; diff --git a/fragments/labels/musescore.sh b/fragments/labels/musescore.sh index d355235..80fe615 100644 --- a/fragments/labels/musescore.sh +++ b/fragments/labels/musescore.sh @@ -4,5 +4,4 @@ musescore) downloadURL=$(downloadURLFromGit musescore MuseScore) appNewVersion=$(versionFromGit musescore MuseScore) expectedTeamID="6EPAF2X3PR" - #Company="Musescore" ;; diff --git a/fragments/labels/nextcloud.sh b/fragments/labels/nextcloud.sh index 67fec66..f29c8b5 100644 --- a/fragments/labels/nextcloud.sh +++ b/fragments/labels/nextcloud.sh @@ -3,9 +3,10 @@ nextcloud) type="pkg" #packageID="com.nextcloud.desktopclient" downloadURL=$(downloadURLFromGit nextcloud desktop) - #appNewVersion=$(versionFromGit nextcloud desktop) + appNewVersion=$(versionFromGit nextcloud desktop) # The version of the app is not equal to the version listed on GitHub. # App version something like "3.1.3git (build 4850)" but web page lists as "3.1.3" # Also it does not math packageID version "3.1.34850" + appCustomVersion(){defaults read /Applications/nextcloud.app/Contents/Info.plist CFBundleShortVersionString | sed -E 's/^([0-9.]*)git.*/\1/g'} expectedTeamID="NKUJUXUJ3B" ;; diff --git a/fragments/labels/notion.sh b/fragments/labels/notion.sh index 2a51d2e..aa1ab0a 100644 --- a/fragments/labels/notion.sh +++ b/fragments/labels/notion.sh @@ -7,7 +7,6 @@ notion) elif [[ $(arch) == "i386" ]]; then downloadURL="https://www.notion.so/desktop/mac/download" fi - appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr -d ' -' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' ) + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr -d '\r\n' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' ) expectedTeamID="LBQJ96FQ8D" ;; diff --git a/fragments/labels/nvivo.sh b/fragments/labels/nvivo.sh index eb498b1..c2793f4 100644 --- a/fragments/labels/nvivo.sh +++ b/fragments/labels/nvivo.sh @@ -2,8 +2,7 @@ nvivo) name="NVivo" type="dmg" downloadURL="https://download.qsrinternational.com/Software/NVivoforMac/NVivo.dmg" - appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr '/' ' -' | grep "[0-9]" | cut -d "." -f1-3 ) + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr '/' '\n' | grep "[0-9]" | cut -d "." -f1-3 ) expectedTeamID="A66L57342X" blockingProcesses=( NVivo NVivoHelper ) ;; diff --git a/fragments/labels/obs.sh b/fragments/labels/obs.sh new file mode 100644 index 0000000..4685446 --- /dev/null +++ b/fragments/labels/obs.sh @@ -0,0 +1,7 @@ +obs) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="OBS" + type="dmg" + downloadURL=$(curl -fs "https://obsproject.com/download" | awk -F '"' "/dmg/ {print \$10}") + expectedTeamID="2MMRE5MTB8" + ;; diff --git a/fragments/labels/onionshare.sh b/fragments/labels/onionshare.sh index 1311054..4fe697c 100644 --- a/fragments/labels/onionshare.sh +++ b/fragments/labels/onionshare.sh @@ -2,8 +2,7 @@ onionshare) # credit: Søren Theilgaard (@theilgaard) name="OnionShare" type="dmg" - downloadURL="https://onionshare.org$(curl -fs https://onionshare.org | grep "button.*dmg" | tr '"' ' -' | grep ".dmg")" + downloadURL="https://onionshare.org$(curl -fs https://onionshare.org | grep "button.*dmg" | tr '"' '\n' | grep ".dmg")" appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' ) expectedTeamID="N9B95FDWH4" ;; diff --git a/fragments/labels/onlyofficedesktop.sh b/fragments/labels/onlyofficedesktop.sh index d8bd0b2..b1e6174 100644 --- a/fragments/labels/onlyofficedesktop.sh +++ b/fragments/labels/onlyofficedesktop.sh @@ -1,5 +1,4 @@ onlyofficedesktop) - # credit: Adrian Bühler (@midni9ht) name="ONLYOFFICE" type="dmg" downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/distrib/onlyoffice/ONLYOFFICE.dmg" diff --git a/fragments/labels/opera.sh b/fragments/labels/opera.sh index d38acf6..78eda31 100644 --- a/fragments/labels/opera.sh +++ b/fragments/labels/opera.sh @@ -1,10 +1,8 @@ opera) name="Opera" type="dmg" - downloadURL="https://get.geo.opera.com/ftp/pub/opera/desktop/"$( curl -fs "https://get.geo.opera.com/ftp/pub/opera/desktop/" | grep href | tail -1 | tr '"' ' -' | grep "/" | head -1 )"mac/Opera_"$( curl -fs "https://get.geo.opera.com/ftp/pub/opera/desktop/" | grep href | tail -1 | tr '"' ' -' | grep "/" | head -1 | sed -E 's/^([0-9.]*)\//\1/g' )"_Setup.dmg" - appNewVersion="$( curl -fs "https://get.geo.opera.com/ftp/pub/opera/desktop/" | grep href | tail -1 | tr '"' ' -' | grep "/" | head -1 | sed -E 's/^([0-9]*\.[0-9]*).*\//\1/g' )" + downloadURL=$(curl -fsIL "$(curl -fs "$(curl -fsIL "https://download.opera.com/download/get/?partner=www&opsys=MacOS" | grep -i "^location" | cut -d " " -f2 | tail -1 | tr -d '\r')" | grep download.opera.com | grep -io "https.*yes" | sed 's/\&/\&/g')" | grep -i "^location" | cut -d " " -f2 | tr -d '\r') + appNewVersion="$(curl -fs "https://get.geo.opera.com/ftp/pub/opera/desktop/" | grep "href=\"\d" | sort -V | tail -1 | tr '"' '\n' | grep "/" | head -1 | tr -d '/')" + versionKey="CFBundleVersion" expectedTeamID="A2P9LX4JPN" ;; diff --git a/fragments/labels/plantronicshub.sh b/fragments/labels/plantronicshub.sh index ad600c4..31eee10 100644 --- a/fragments/labels/plantronicshub.sh +++ b/fragments/labels/plantronicshub.sh @@ -1,6 +1,6 @@ plantronicshub) name="Plantronics Hub" - type="dmg" + type="pkgInDmg" downloadURL="https://www.poly.com/content/dam/www/software/PlantronicsHubInstaller.dmg" expectedTeamID="SKWK2Q7JJV" appNewVersion=$(curl -fs "https://www.poly.com/in/en/support/knowledge-base/kb-article-page?lang=en_US&urlName=Hub-Release-Notes&type=Product_Information__kav" | grep -o "(*.*)" | head -1 | cut -d "(" -f2 | sed 's/\<\/span\>//g' | cut -d "<" -f1) diff --git a/fragments/labels/postman.sh b/fragments/labels/postman.sh index ceed343..e2a6685 100644 --- a/fragments/labels/postman.sh +++ b/fragments/labels/postman.sh @@ -3,6 +3,6 @@ postman) name="Postman" type="zip" downloadURL="https://dl.pstmn.io/download/latest/osx" - appNewVersion=$(curl -Ifs https://dl.pstmn.io/download/latest/osx | grep "content-disposition:" | sed -n -e 's/^.*Postman-osx-//p' | sed 's/\.zip//' | sed $'s/[^[:print:] ]//g' ) + appNewVersion=$(curl -Ifs https://dl.pstmn.io/download/latest/osx | grep "content-disposition:" | sed -n -e 's/^.*Postman-osx-//p' | sed 's/\.zip//' | sed $'s/[^[:print:]\t]//g' ) expectedTeamID="H7H8Q7M5CK" ;; diff --git a/fragments/labels/proctortrack.sh b/fragments/labels/proctortrack.sh index aedc3a7..9faf267 100644 --- a/fragments/labels/proctortrack.sh +++ b/fragments/labels/proctortrack.sh @@ -4,5 +4,4 @@ proctortrack) type="zip" downloadURL="https://storage.googleapis.com/verificientstatic/ProctortrackApp/Production/Proctortrack.zip" expectedTeamID="SNHZD6TJE6" - #Company="Verificient Technologies" ;; diff --git a/fragments/labels/promiseutilityr.sh b/fragments/labels/promiseutilityr.sh index d6983f9..78ef92b 100644 --- a/fragments/labels/promiseutilityr.sh +++ b/fragments/labels/promiseutilityr.sh @@ -4,5 +4,4 @@ promiseutilityr) packageID="com.promise.utilinstaller" downloadURL="https://www.promise.com/DownloadFile.aspx?DownloadFileUID=6533" expectedTeamID="268CCUR4WN" - #Company="Promise" ;; diff --git a/fragments/labels/proxyman.sh b/fragments/labels/proxyman.sh new file mode 100644 index 0000000..cb78fe3 --- /dev/null +++ b/fragments/labels/proxyman.sh @@ -0,0 +1,7 @@ +proxyman) + name="Proxyman" + type="dmg" + downloadURL="https://proxyman.io/release/osx/Proxyman_latest.dmg" + expectedTeamID="3X57WP8E8V" + appNewVersion=$(curl -s -L https://github.com/ProxymanApp/Proxyman | grep -o 'releases/tag/.*\>' | awk -F '/' '{print $3}') + ;; diff --git a/fragments/labels/pymol.sh b/fragments/labels/pymol.sh index 7d38321..e3428d9 100644 --- a/fragments/labels/pymol.sh +++ b/fragments/labels/pymol.sh @@ -3,5 +3,4 @@ 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." ;; diff --git a/fragments/labels/ramboxce.sh b/fragments/labels/ramboxce.sh index d72cf7a..3fc7381 100644 --- a/fragments/labels/ramboxce.sh +++ b/fragments/labels/ramboxce.sh @@ -1,5 +1,4 @@ ramboxce) - # credit: Adrian Bühler (@midni9ht) name="Rambox" type="dmg" downloadURL=$(downloadURLFromGit ramboxapp community-edition ) diff --git a/fragments/labels/ricohpsprinters.sh b/fragments/labels/ricohpsprinters.sh index 826fc61..6f78a93 100644 --- a/fragments/labels/ricohpsprinters.sh +++ b/fragments/labels/ricohpsprinters.sh @@ -4,6 +4,4 @@ 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" ;; diff --git a/fragments/labels/ringcentralclassicapp.sh b/fragments/labels/ringcentralclassicapp.sh index cf18b3b..78d4186 100644 --- a/fragments/labels/ringcentralclassicapp.sh +++ b/fragments/labels/ringcentralclassicapp.sh @@ -5,5 +5,4 @@ ringcentralclassicapp) expectedTeamID="M932RC5J66" blockingProcesses=( "Glip" ) #blockingProcessesMaxCPU="5" - #Company="RingCentral" ;; diff --git a/fragments/labels/ringcentralphone.sh b/fragments/labels/ringcentralphone.sh index be5ac10..4252722 100644 --- a/fragments/labels/ringcentralphone.sh +++ b/fragments/labels/ringcentralphone.sh @@ -5,5 +5,4 @@ ringcentralphone) downloadURL="https://downloads.ringcentral.com/sp/RingCentralForMac" expectedTeamID="M932RC5J66" blockingProcesses=( "RingCentral Phone" ) - #Company="RingCentral" ;; diff --git a/fragments/labels/rstudio.sh b/fragments/labels/rstudio.sh index 8fdc66e..22f735e 100644 --- a/fragments/labels/rstudio.sh +++ b/fragments/labels/rstudio.sh @@ -4,5 +4,4 @@ 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" ;; diff --git a/fragments/labels/screenflick.sh b/fragments/labels/screenflick.sh new file mode 100644 index 0000000..6c31e50 --- /dev/null +++ b/fragments/labels/screenflick.sh @@ -0,0 +1,7 @@ +screenflick) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="Screenflick" + type="zip" + downloadURL="https://www.araelium.com/screenflick/downloads/Screenflick.zip" + expectedTeamID="28488A87JB" + ;; diff --git a/fragments/labels/sidekick.sh b/fragments/labels/sidekick.sh index 1863aec..256ebdf 100644 --- a/fragments/labels/sidekick.sh +++ b/fragments/labels/sidekick.sh @@ -4,5 +4,4 @@ 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." ;; diff --git a/fragments/labels/sirimote.sh b/fragments/labels/sirimote.sh new file mode 100644 index 0000000..fca8628 --- /dev/null +++ b/fragments/labels/sirimote.sh @@ -0,0 +1,7 @@ +sirimote) + name="SiriMote" + type="zip" + downloadURL="http://bit.ly/sirimotezip" + #appNewVersion="" # Not found on web page + expectedTeamID="G78RJ6NLJU" + ;; diff --git a/fragments/labels/sketch.sh b/fragments/labels/sketch.sh index cb1cf27..1f78e05 100644 --- a/fragments/labels/sketch.sh +++ b/fragments/labels/sketch.sh @@ -12,5 +12,4 @@ 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" ;; diff --git a/fragments/labels/slack.sh b/fragments/labels/slack.sh index 03c0895..c5068d6 100644 --- a/fragments/labels/slack.sh +++ b/fragments/labels/slack.sh @@ -7,7 +7,6 @@ slack) # elif [[ $(arch) == "i386" ]]; then # downloadURL="https://slack.com/ssb/download-osx" # fi - appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr -d ' -' | sed -E 's/.*macos\/([0-9.]*)\/.*/\1/g' ) + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr -d '\r\n' | sed -E 's/.*macos\/([0-9.]*)\/.*/\1/g' ) expectedTeamID="BQR82RBBHL" ;; diff --git a/fragments/labels/snapgeneviewer.sh b/fragments/labels/snapgeneviewer.sh index c1c965c..c18494a 100644 --- a/fragments/labels/snapgeneviewer.sh +++ b/fragments/labels/snapgeneviewer.sh @@ -2,7 +2,6 @@ snapgeneviewer) name="SnapGene Viewer" type="dmg" downloadURL="https://www.snapgene.com/local/targets/download.php?variant=viewer&os=mac&majorRelease=latest&minorRelease=latest" - appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr '/' ' -' | grep -i "dmg" | sed -E 's/[a-zA-Z_]*_([0-9.]*)_mac\.dmg/\1/g' ) + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr '/' '\n' | grep -i "dmg" | sed -E 's/[a-zA-Z_]*_([0-9.]*)_mac\.dmg/\1/g' ) expectedTeamID="WVCV9Q8Y78" ;; diff --git a/fragments/labels/sourcetree.sh b/fragments/labels/sourcetree.sh index bb93cae..1afe955 100644 --- a/fragments/labels/sourcetree.sh +++ b/fragments/labels/sourcetree.sh @@ -1,9 +1,7 @@ sourcetree) name="Sourcetree" type="zip" - downloadURL=$(curl -fs https://product-downloads.atlassian.com/software/sourcetree/Appcast/SparkleAppcastAlpha.xml \ - | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null \ - | cut -d '"' -f 2 ) - appNewVersion=$(curl -fs https://product-downloads.atlassian.com/software/sourcetree/Appcast/SparkleAppcastAlpha.xml | xpath '//rss/channel/item[last()]/title' 2>/dev/null | sed -n -e 's/^.*Version //p' | sed 's/\<\/title\>//' | sed $'s/[^[:print:] ]//g') + downloadURL=$(curl -fs "https://www.sourcetreeapp.com" | grep -i "macURL" | tr '"' '\n' | grep -io "https://.*/Sourcetree.*\.zip" | tail -1) + appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*\/Sourcetree_([0-9.]*)_[0-9]*\.zip/\1/g') expectedTeamID="UPXU4CQZ5P" ;; diff --git a/fragments/labels/sublimetext.sh b/fragments/labels/sublimetext.sh index ee5c8aa..5f63257 100644 --- a/fragments/labels/sublimetext.sh +++ b/fragments/labels/sublimetext.sh @@ -1,9 +1,8 @@ sublimetext) - # credit: Mischa van der Bent (@mischavdbent) + # credit: Søren Theilgaard (@theilgaard) name="Sublime Text" - type="dmg" - downloadURL="https://download.sublimetext.com/latest/stable/osx" - appNewVersion=$(curl -fs https://www.sublimetext.com/3 | grep 'class="latest"' | cut -d '>' -f 4 | sed -E 's/ (.*[0-9]*)<.*/\1/g') - #appNewVersion=$(curl -Is https://download.sublimetext.com/latest/stable/osx | grep "Location:" | sed -n -e 's/^.*Sublime Text //p' | sed 's/.dmg//g' | sed $'s/[^[:print:] ]//g') # Alternative from @Oh4sh0 + type="zip" + downloadURL="$(curl -fs https://www.sublimetext.com/download | grep -io "https://download.*_mac.zip")" + appNewVersion=$(curl -fs https://www.sublimetext.com/download | grep -i -A 4 "id.*changelog" | grep -io "Build [0-9]*") expectedTeamID="Z6D26JE4Y4" ;; diff --git a/fragments/labels/supportapp.sh b/fragments/labels/supportapp.sh new file mode 100644 index 0000000..ed09898 --- /dev/null +++ b/fragments/labels/supportapp.sh @@ -0,0 +1,9 @@ +supportapp) + # credit: Søren Theilgaard (@theilgaard) + name="Support" + type="pkg" + packageID="nl.root3.support" + downloadURL=$(downloadURLFromGit root3nl SupportApp) + appNewVersion=$(versionFromGit root3nl SupportApp) + expectedTeamID="98LJ4XBGYK" + ;; diff --git a/fragments/labels/tableaudesktop.sh b/fragments/labels/tableaudesktop.sh new file mode 100644 index 0000000..8859332 --- /dev/null +++ b/fragments/labels/tableaudesktop.sh @@ -0,0 +1,7 @@ +tableaudesktop) + name="Tableau Desktop" + type="pkgInDmg" + packageID="com.tableausoftware.tableaudesktop" + downloadURL="https://www.tableau.com/downloads/desktop/mac" + expectedTeamID="QJ4XPRK37C" + ;; diff --git a/fragments/labels/teamviewer.sh b/fragments/labels/teamviewer.sh index eb25498..2e48702 100644 --- a/fragments/labels/teamviewer.sh +++ b/fragments/labels/teamviewer.sh @@ -1,7 +1,9 @@ teamviewer) name="TeamViewer" type="pkgInDmg" + packageID="com.teamviewer.teamviewer" pkgName="Install TeamViewer.app/Contents/Resources/Install TeamViewer.pkg" downloadURL="https://download.teamviewer.com/download/TeamViewer.dmg" + appNewVersion=$(curl -fs "https://www.teamviewer.com/en/download/mac-os/" | grep "Current version" | cut -d " " -f3 | cut -d "<" -f1) expectedTeamID="H7UGFBUGV6" ;; diff --git a/fragments/labels/teamviewerhost.sh b/fragments/labels/teamviewerhost.sh index 803306f..99a010d 100644 --- a/fragments/labels/teamviewerhost.sh +++ b/fragments/labels/teamviewerhost.sh @@ -3,7 +3,7 @@ teamviewerhost) type="pkgInDmg" packageID="com.teamviewer.teamviewerhost" pkgName="Install TeamViewerHost.app/Contents/Resources/Install TeamViewerHost.pkg" downloadURL="https://download.teamviewer.com/download/TeamViewerHost.dmg" + 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" ;; diff --git a/fragments/labels/teamviewerqs.sh b/fragments/labels/teamviewerqs.sh index 6109dc0..84f5c09 100644 --- a/fragments/labels/teamviewerqs.sh +++ b/fragments/labels/teamviewerqs.sh @@ -3,6 +3,7 @@ teamviewerqs) name="TeamViewerQS" type="dmg" downloadURL="https://download.teamviewer.com/download/TeamViewerQS.dmg" + appNewVersion=$(curl -fs "https://www.teamviewer.com/en/download/mac-os/" | grep "Current version" | cut -d " " -f3 | cut -d "<" -f1) appName="TeamViewerQS.app" expectedTeamID="H7UGFBUGV6" ;; diff --git a/fragments/labels/techsmithcapture.sh b/fragments/labels/techsmithcapture.sh new file mode 100644 index 0000000..7ce9941 --- /dev/null +++ b/fragments/labels/techsmithcapture.sh @@ -0,0 +1,7 @@ +techsmithcapture) + # credit Elena Ackley (@elenaelago) + name="TechSmith Capture" + type="dmg" + downloadURL="https://cdn.cloud.techsmith.com/techsmithcapture/mac/TechSmithCapture.dmg" + expectedTeamID="7TQL462TU8" + ;; diff --git a/fragments/labels/textexpander.sh b/fragments/labels/textexpander.sh new file mode 100644 index 0000000..4657ce5 --- /dev/null +++ b/fragments/labels/textexpander.sh @@ -0,0 +1,7 @@ +textexpander) + name="TextExpander" + type="zip" + downloadURL="https://textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx" + appNewVersion=$( curl -fsIL "https://textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx" | grep -i "^location" | awk '{print $2}' | tail -1 | cut -d "_" -f2 | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p' ) + expectedTeamID="7PKJ6G4DXL" + ;; diff --git a/fragments/labels/theunarchiver.sh b/fragments/labels/theunarchiver.sh new file mode 100644 index 0000000..6d59f60 --- /dev/null +++ b/fragments/labels/theunarchiver.sh @@ -0,0 +1,8 @@ +theunarchiver) + name="The Unarchiver" + type="dmg" + downloadURL="https://dl.devmate.com/com.macpaw.site.theunarchiver/TheUnarchiver.dmg" + appNewVersion="$(curl -fs "https://theunarchiver.com" | grep -i "Latest version" | head -1 | sed -E 's/.*> ([0-9.]*) .*/\1/g')" + expectedTeamID="S8EX82NJP6" + appName="The Unarchiver.app" + ;; diff --git a/fragments/labels/toggltrack.sh b/fragments/labels/toggltrack.sh index 3ee8a9c..e47f69b 100644 --- a/fragments/labels/toggltrack.sh +++ b/fragments/labels/toggltrack.sh @@ -1,5 +1,4 @@ toggltrack) - # credit: Adrian Bühler (@midni9ht) name="Toggl Track" type="dmg" downloadURL=$(downloadURLFromGit toggl-open-source toggldesktop ) diff --git a/fragments/labels/trex.sh b/fragments/labels/trex.sh new file mode 100644 index 0000000..863ae61 --- /dev/null +++ b/fragments/labels/trex.sh @@ -0,0 +1,8 @@ +trex) + # credit: Søren Theilgaard (@theilgaard) + name="TRex" + type="zip" + downloadURL=$(downloadURLFromGit amebalabs TRex) + appNewVersion=$(versionFromGit amebalabs TRex) + expectedTeamID="X93LWC49WV" + ;; diff --git a/fragments/labels/uniconverter.sh b/fragments/labels/uniconverter.sh new file mode 100644 index 0000000..77b875a --- /dev/null +++ b/fragments/labels/uniconverter.sh @@ -0,0 +1,7 @@ +uniconverter) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="Wondershare UniConverter" + type="dmg" + downloadURL="http://download.wondershare.com/video-converter-ultimate-mac_full735.dmg" + expectedTeamID="YZC2T44ZDX" + ;; diff --git a/fragments/labels/universaltypeclient.sh b/fragments/labels/universaltypeclient.sh index 324c1d2..d019b1b 100644 --- a/fragments/labels/universaltypeclient.sh +++ b/fragments/labels/universaltypeclient.sh @@ -4,5 +4,4 @@ universaltypeclient) #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" ;; diff --git a/fragments/labels/vagrant.sh b/fragments/labels/vagrant.sh index 3aeddc4..a69e352 100644 --- a/fragments/labels/vagrant.sh +++ b/fragments/labels/vagrant.sh @@ -3,8 +3,7 @@ vagrant) name="Vagrant" type="pkgInDmg" pkgName="vagrant.pkg" - downloadURL=$(curl -fs https://www.vagrantup.com/downloads | tr '><' ' -' | awk -F'"' '/x86_64.dmg/ {print $6}' | head -1) + downloadURL=$(curl -fs https://www.vagrantup.com/downloads | tr '><' '\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" diff --git a/fragments/labels/valuesfromarguments.sh b/fragments/labels/valuesfromarguments.sh deleted file mode 100644 index 24270c7..0000000 --- a/fragments/labels/valuesfromarguments.sh +++ /dev/null @@ -1,18 +0,0 @@ -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 - ;; diff --git a/fragments/labels/vanilla.sh b/fragments/labels/vanilla.sh index e6ddd60..1f1f44f 100644 --- a/fragments/labels/vanilla.sh +++ b/fragments/labels/vanilla.sh @@ -1,5 +1,4 @@ vanilla) - # credit: Adrian Bühler (@midni9ht) name="Vanilla" type="dmg" downloadURL="https://macrelease.matthewpalmer.net/Vanilla.dmg" diff --git a/fragments/labels/veracrypt.sh b/fragments/labels/veracrypt.sh index b6d3918..b47fc91 100644 --- a/fragments/labels/veracrypt.sh +++ b/fragments/labels/veracrypt.sh @@ -2,8 +2,7 @@ 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 '"' ' -' | grep "^https.*" | grep -vi ".sig" | 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" ;; diff --git a/fragments/labels/vivaldi.sh b/fragments/labels/vivaldi.sh index 18501a7..bd30443 100644 --- a/fragments/labels/vivaldi.sh +++ b/fragments/labels/vivaldi.sh @@ -1,9 +1,7 @@ vivaldi) - # credit: Adrian Bühler (@midni9ht) 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 ',' ' -' | grep sparkle:version | cut -d '"' -f 4) + 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" ;; diff --git a/fragments/labels/webex.sh b/fragments/labels/webex.sh new file mode 100644 index 0000000..bad8a1a --- /dev/null +++ b/fragments/labels/webex.sh @@ -0,0 +1,12 @@ +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" + ;; diff --git a/fragments/labels/wickrme.sh b/fragments/labels/wickrme.sh index bc12af0..2ce25d4 100644 --- a/fragments/labels/wickrme.sh +++ b/fragments/labels/wickrme.sh @@ -2,8 +2,7 @@ wickrme) # credit: Søren Theilgaard (@theilgaard) name="WickrMe" type="dmg" - downloadURL=$( curl -fs https://me-download.wickr.com/api/download/me/download/mac | tr '"' ' -' | grep -e '^https://' ) + 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" ;; diff --git a/fragments/labels/wickrpro.sh b/fragments/labels/wickrpro.sh index 08b88fd..6ddec0e 100644 --- a/fragments/labels/wickrpro.sh +++ b/fragments/labels/wickrpro.sh @@ -2,8 +2,7 @@ wickrpro) # credit: Søren Theilgaard (@theilgaard) name="WickrPro" type="dmg" - downloadURL=$( curl -fs https://me-download.wickr.com/api/download/pro/download/mac | tr '"' ' -' | grep -e '^https://' ) + 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" ;; diff --git a/fragments/labels/wireshark.sh b/fragments/labels/wireshark.sh index 4938f29..d9617b5 100644 --- a/fragments/labels/wireshark.sh +++ b/fragments/labels/wireshark.sh @@ -3,6 +3,6 @@ wireshark) 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}') + appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F '[()]' '{print $2}') expectedTeamID="7Z6EMTD2C6" ;; diff --git a/fragments/labels/wwdc.sh b/fragments/labels/wwdc.sh new file mode 100644 index 0000000..21b6b3b --- /dev/null +++ b/fragments/labels/wwdc.sh @@ -0,0 +1,8 @@ +wwdc) + # credit: Søren Theilgaard (@theilgaard) + name="WWDC" + type="dmg" + downloadURL=$(downloadURLFromGit insidegui WWDC) + appNewVersion=$(versionFromGit insidegui WWDC) + expectedTeamID="8C7439RJLG" + ;; diff --git a/fragments/labels/xeroxphaser7800.sh b/fragments/labels/xeroxphaser7800.sh index 52931f8..8d8d0b4 100644 --- a/fragments/labels/xeroxphaser7800.sh +++ b/fragments/labels/xeroxphaser7800.sh @@ -3,6 +3,4 @@ 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 ;; diff --git a/fragments/labels/xquartz.sh b/fragments/labels/xquartz.sh new file mode 100644 index 0000000..7bbdeca --- /dev/null +++ b/fragments/labels/xquartz.sh @@ -0,0 +1,8 @@ +xquartz) + # credit: AP Orlebeke (@apizz) + name="XQuartz" + type="pkgInDmg" + downloadURL=$(downloadURLFromGit XQuartz XQuartz) + appNewVersion=$(versionFromGit XQuartz XQuartz) + expectedTeamID="NA574AWV7E" + ;; diff --git a/fragments/labels/zappy.sh b/fragments/labels/zappy.sh index aade0f0..ecfbf4f 100644 --- a/fragments/labels/zappy.sh +++ b/fragments/labels/zappy.sh @@ -3,5 +3,4 @@ zappy) type="appInDmgInZip" downloadURL="https://zappy.zapier.com/releases/zappy-latest.zip" expectedTeamID="6LS97Q5E79" - #Company="Zapier" ;; diff --git a/fragments/labels/zoomclient.sh b/fragments/labels/zoomclient.sh index 27eb49a..44ec765 100644 --- a/fragments/labels/zoomclient.sh +++ b/fragments/labels/zoomclient.sh @@ -4,9 +4,7 @@ zoomclient) 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 + #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" ;; diff --git a/fragments/labels/zoomrooms.sh b/fragments/labels/zoomrooms.sh new file mode 100644 index 0000000..595be20 --- /dev/null +++ b/fragments/labels/zoomrooms.sh @@ -0,0 +1,9 @@ +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" ) +   ;; diff --git a/fragments/labels/zulujdk11.sh b/fragments/labels/zulujdk11.sh index 90086af..22fdb31 100644 --- a/fragments/labels/zulujdk11.sh +++ b/fragments/labels/zulujdk11.sh @@ -3,15 +3,11 @@ zulujdk11) 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 , ' -' | grep -o "https:.*/zulu11.*ca-jdk11.*x64.dmg" | sed 's/\//g') + 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 , ' -' | grep -o "https:.*/zulu11.*ca-jdk11.*aarch64.dmg" | sed 's/\//g') + 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 - #Company="Azul" - #PatchSkip="YES" + 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 ;; diff --git a/fragments/labels/zulujdk13.sh b/fragments/labels/zulujdk13.sh index e280e04..7b3c60d 100644 --- a/fragments/labels/zulujdk13.sh +++ b/fragments/labels/zulujdk13.sh @@ -3,15 +3,11 @@ zulujdk13) 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 , ' -' | grep -o "https:.*/zulu13.*ca-jdk13.*x64.dmg" | sed 's/\//g') + 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 , ' -' | grep -o "https:.*/zulu13.*ca-jdk13.*aarch64.dmg" | sed 's/\//g') + 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 - #Company="Azul" - #PatchSkip="YES" + 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 ;; diff --git a/fragments/labels/zulujdk15.sh b/fragments/labels/zulujdk15.sh index df52749..49f1188 100644 --- a/fragments/labels/zulujdk15.sh +++ b/fragments/labels/zulujdk15.sh @@ -3,15 +3,11 @@ zulujdk15) 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 , ' -' | grep -o "https:.*/zulu15.*ca-jdk15.*x64.dmg" | sed 's/\//g') + 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 , ' -' | grep -o "https:.*/zulu15.*ca-jdk15.*aarch64.dmg" | sed 's/\//g') + 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 - #Company="Azul" - #PatchSkip="YES" + 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 ;; diff --git a/utils/extractLabels.sh b/utils/extractLabels.sh index f6fbb4d..264acce 100755 --- a/utils/extractLabels.sh +++ b/utils/extractLabels.sh @@ -19,7 +19,7 @@ while read -r line; do current_label=$current_label$'\n'$line fi if [[ $in_label -eq 1 && "$line" =~ $endlabel_re ]]; then - echo $current_label > "$label_dir/${label_name}.txt" + echo $current_label > "$label_dir/${label_name}.sh" in_label=0 current_label="" fi