From 9f79cf4d65e672fd7c8d4cd0e3c4fd45142b83f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Thu, 3 Mar 2022 21:35:22 +0100 Subject: [PATCH 01/91] Update functions.sh --- fragments/functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fragments/functions.sh b/fragments/functions.sh index d2432d1..c56d526 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -242,8 +242,8 @@ getAppVersion() { # printlog "App(s) found: ${applist}" DEBUG # applist=$(mdfind "kind:application AND name:$appName" -0 ) fi - if [[ -z applist ]]; then - printlog "No previous app found" INFO + if [[ -z $applist ]]; then + printlog "No previous app found" WARN else printlog "App(s) found: ${applist}" INFO fi @@ -265,7 +265,7 @@ getAppVersion() { if [[ -d "$installedAppPath"/Contents/_MASReceipt ]];then printlog "Installed $appName is from App Store, use “IGNORE_APP_STORE_APPS=yes” to replace." if [[ $IGNORE_APP_STORE_APPS == "yes" ]]; then - printlog "Replacing App Store apps, no matter the version" + printlog "Replacing App Store apps, no matter the version" WARN appversion=0 else cleanupAndExit 1 "App previously installed from App Store, and we respect that" ERROR From 30f1f1b43c4545ebf61153b5b61cda7fb51dbdd6 Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Fri, 18 Mar 2022 09:43:41 +0100 Subject: [PATCH 02/91] Create displaylinkmanager.sh Created a DisplayLink Manager label --- fragments/labels/displaylinkmanager.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fragments/labels/displaylinkmanager.sh diff --git a/fragments/labels/displaylinkmanager.sh b/fragments/labels/displaylinkmanager.sh new file mode 100644 index 0000000..484164f --- /dev/null +++ b/fragments/labels/displaylinkmanager.sh @@ -0,0 +1,7 @@ +displaylinkmanager) + name="DisplayLink Manager" + type="pkg" + packageID="com.displaylink.displaylinkmanagerapp" + downloadURL=https://www.synaptics.com$(redirect=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep 'class="download-link">Download' | head -n 1 | sed 's/.*href="//' | sed 's/".*//') && curl -sfL "https://www.synaptics.com$redirect" | grep Accept | head -n 1 | sed 's/.*href="//' | sed 's/".*//') + expectedTeamID="73YQY62QM3" + ;; From 034ac45ba09ccdefa71d78d5fcd3adf62b315ba3 Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Fri, 18 Mar 2022 15:45:19 +0100 Subject: [PATCH 03/91] Update displaylinkmanager.sh Added appNewVersion --- fragments/labels/displaylinkmanager.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fragments/labels/displaylinkmanager.sh b/fragments/labels/displaylinkmanager.sh index 484164f..5ef4427 100644 --- a/fragments/labels/displaylinkmanager.sh +++ b/fragments/labels/displaylinkmanager.sh @@ -1,7 +1,8 @@ displaylinkmanager) name="DisplayLink Manager" type="pkg" - packageID="com.displaylink.displaylinkmanagerapp" + #packageID="com.displaylink.displaylinkmanagerapp" downloadURL=https://www.synaptics.com$(redirect=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep 'class="download-link">Download' | head -n 1 | sed 's/.*href="//' | sed 's/".*//') && curl -sfL "https://www.synaptics.com$redirect" | grep Accept | head -n 1 | sed 's/.*href="//' | sed 's/".*//') + appNewVersion=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep "Release:" | head -n 1 | cut -d ' ' -f2) expectedTeamID="73YQY62QM3" ;; From 7456bdad04fce8dd2d8193d285a3351a8eabedc3 Mon Sep 17 00:00:00 2001 From: Liam Steckler <553265+buckbanzai@users.noreply.github.com> Date: Mon, 21 Mar 2022 16:41:58 -0700 Subject: [PATCH 04/91] Add Talkdesk CX Cloud Label --- fragments/labels/talkdeskcxcloud.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fragments/labels/talkdeskcxcloud.sh diff --git a/fragments/labels/talkdeskcxcloud.sh b/fragments/labels/talkdeskcxcloud.sh new file mode 100644 index 0000000..cb3f86f --- /dev/null +++ b/fragments/labels/talkdeskcxcloud.sh @@ -0,0 +1,7 @@ +talkdeskcxcloud) + name="Talkdesk" + type="dmg" + appNewVersion=$(curl -fsL https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-latest-metadata.json | sed -n -e 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p' | head -n 1) + downloadURL="https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-${appNewVersion}.dmg" + expectedTeamID="YGGJX44TB8" + ;; From bb935516d17e87e5a5ef6a181a2cd27d375273f4 Mon Sep 17 00:00:00 2001 From: Liam Steckler <553265+buckbanzai@users.noreply.github.com> Date: Mon, 21 Mar 2022 16:50:48 -0700 Subject: [PATCH 05/91] removed unneeded -L paramater from curl --- fragments/labels/talkdeskcxcloud.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/talkdeskcxcloud.sh b/fragments/labels/talkdeskcxcloud.sh index cb3f86f..2326146 100644 --- a/fragments/labels/talkdeskcxcloud.sh +++ b/fragments/labels/talkdeskcxcloud.sh @@ -1,7 +1,7 @@ talkdeskcxcloud) name="Talkdesk" type="dmg" - appNewVersion=$(curl -fsL https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-latest-metadata.json | sed -n -e 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p' | head -n 1) + appNewVersion=$(curl -fs https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-latest-metadata.json | sed -n -e 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p' | head -n 1) downloadURL="https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-${appNewVersion}.dmg" expectedTeamID="YGGJX44TB8" ;; From c728c25fc45c7a6409c0998f2adb8e2ded5af0ca Mon Sep 17 00:00:00 2001 From: Liam Steckler <553265+buckbanzai@users.noreply.github.com> Date: Mon, 21 Mar 2022 17:06:26 -0700 Subject: [PATCH 06/91] Updated label sed and downloadURL --- fragments/labels/talkdeskcallbar.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fragments/labels/talkdeskcallbar.sh b/fragments/labels/talkdeskcallbar.sh index 9487d44..fb773b4 100644 --- a/fragments/labels/talkdeskcallbar.sh +++ b/fragments/labels/talkdeskcallbar.sh @@ -1,7 +1,7 @@ talkdeskcallbar) name="Callbar" type="dmg" - downloadURL=https://downloadcallbar.talkdesk.com/Callbar-$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version":"\([^"]*\)".*$/\1/p').dmg - appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version":"\([^"]*\)".*$/\1/p') + appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p') + downloadURL=https://downloadcallbar.talkdesk.com/Callbar-${appNewVersion}.dmg expectedTeamID="YGGJX44TB8" ;; From 600657b0741c0b4f7a54a8cc4ec148e75ccba468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20B=C3=BChler?= <48823479+adibue@users.noreply.github.com> Date: Tue, 22 Mar 2022 11:40:43 +0100 Subject: [PATCH 07/91] Add downloadURL for ARM. Add appNewVersion Unfortunately I could not find any other version source for `appNewVersion`. Should work just fine tho. --- fragments/labels/onlyofficedesktop.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fragments/labels/onlyofficedesktop.sh b/fragments/labels/onlyofficedesktop.sh index b1e6174..f5376c7 100644 --- a/fragments/labels/onlyofficedesktop.sh +++ b/fragments/labels/onlyofficedesktop.sh @@ -1,6 +1,11 @@ onlyofficedesktop) name="ONLYOFFICE" type="dmg" - downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/distrib/onlyoffice/ONLYOFFICE.dmg" + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/arm/distrib/ONLYOFFICE.dmg" + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/x86_64/distrib/ONLYOFFICE.dmg" + fi + appNewVersion=$(versionFromGit ONLYOFFICE DesktopEditors) expectedTeamID="2WH24U26GJ" ;; From cec9d53ff80c57b58dc4f5d20855f6eaf8f93839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 22 Mar 2022 16:39:30 +0100 Subject: [PATCH 08/91] QGIS software latest release "pr" This will download the release called "Latest release (richest on features)". ``` $ Installomator/utils/assemble.sh qgis-pr DEBUG=0 2022-03-22 16:23:41 : WARN : qgis-pr : setting variable from argument DEBUG=0 2022-03-22 16:23:41 : REQ : qgis-pr : ################## Start Installomator v. 10dev, date 2022-03-22 2022-03-22 16:23:41 : INFO : qgis-pr : ################## Version: 10dev 2022-03-22 16:23:41 : INFO : qgis-pr : ################## Date: 2022-03-22 2022-03-22 16:23:41 : INFO : qgis-pr : ################## qgis-pr 2022-03-22 16:23:42 : INFO : qgis-pr : BLOCKING_PROCESS_ACTION=tell_user 2022-03-22 16:23:42 : INFO : qgis-pr : NOTIFY=success 2022-03-22 16:23:42 : INFO : qgis-pr : LOGGING=INFO 2022-03-22 16:23:42 : INFO : qgis-pr : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-03-22 16:23:42 : INFO : qgis-pr : Label type: dmg 2022-03-22 16:23:42 : INFO : qgis-pr : archiveName: QGIS.dmg 2022-03-22 16:23:42 : INFO : qgis-pr : no blocking processes defined, using QGIS as default 2022-03-22 16:23:42 : INFO : qgis-pr : name: QGIS, appName: QGIS.app 2022-03-22 16:23:42 : INFO : qgis-pr : App(s) found: 2022-03-22 16:23:42 : WARN : qgis-pr : could not find QGIS.app 2022-03-22 16:23:42 : INFO : qgis-pr : appversion: 2022-03-22 16:23:42 : INFO : qgis-pr : Latest version of QGIS is 3.24.1 2022-03-22 16:23:42 : REQ : qgis-pr : Downloading https://download.qgis.org/downloads/macos/qgis-macos-pr.dmg to QGIS.dmg 2022-03-22 16:25:31 : REQ : qgis-pr : no more blocking processes, continue with update 2022-03-22 16:25:31 : REQ : qgis-pr : Installing QGIS 2022-03-22 16:25:31 : INFO : qgis-pr : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.DTKj8N3Y/QGIS.dmg 2022-03-22 16:26:48 : INFO : qgis-pr : Mounted: /Volumes/QGIS.app 1 2022-03-22 16:26:48 : INFO : qgis-pr : Verifying: /Volumes/QGIS.app 1/QGIS.app 2022-03-22 16:29:55 : INFO : qgis-pr : Team ID matching: 4F7N4UDA22 (expected: 4F7N4UDA22 ) 2022-03-22 16:29:55 : INFO : qgis-pr : Installing QGIS version 3.24.1 on versionKey CFBundleShortVersionString. 2022-03-22 16:29:55 : INFO : qgis-pr : App has LSMinimumSystemVersion: 10.13.0 2022-03-22 16:29:55 : INFO : qgis-pr : Copy /Volumes/QGIS.app 1/QGIS.app to /Applications 2022-03-22 16:32:56 : WARN : qgis-pr : Changing owner to st 2022-03-22 16:32:57 : INFO : qgis-pr : Finishing... 2022-03-22 16:33:07 : INFO : qgis-pr : App(s) found: /Applications/QGIS.app 2022-03-22 16:33:07 : INFO : qgis-pr : found app at /Applications/QGIS.app, version 3.24.1, on versionKey CFBundleShortVersionString 2022-03-22 16:33:07 : REQ : qgis-pr : Installed QGIS, version 3.24.1 2022-03-22 16:33:07 : INFO : qgis-pr : notifying 2022-03-22 16:33:08 : INFO : qgis-pr : App not closed, so no reopen. 2022-03-22 16:33:08 : REQ : qgis-pr : All done! 2022-03-22 16:33:08 : REQ : qgis-pr : ################## End Installomator, exit code 0 $ Installomator/utils/assemble.sh qgis-pr DEBUG=0 2022-03-22 16:36:26 : WARN : qgis-pr : setting variable from argument DEBUG=0 2022-03-22 16:36:26 : REQ : qgis-pr : ################## Start Installomator v. 10dev, date 2022-03-22 2022-03-22 16:36:26 : INFO : qgis-pr : ################## Version: 10dev 2022-03-22 16:36:26 : INFO : qgis-pr : ################## Date: 2022-03-22 2022-03-22 16:36:26 : INFO : qgis-pr : ################## qgis-pr 2022-03-22 16:36:26 : INFO : qgis-pr : BLOCKING_PROCESS_ACTION=tell_user 2022-03-22 16:36:26 : INFO : qgis-pr : NOTIFY=success 2022-03-22 16:36:26 : INFO : qgis-pr : LOGGING=INFO 2022-03-22 16:36:26 : INFO : qgis-pr : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-03-22 16:36:26 : INFO : qgis-pr : Label type: dmg 2022-03-22 16:36:26 : INFO : qgis-pr : archiveName: QGIS.dmg 2022-03-22 16:36:26 : INFO : qgis-pr : no blocking processes defined, using QGIS as default 2022-03-22 16:36:26 : INFO : qgis-pr : App(s) found: /Applications/QGIS.app 2022-03-22 16:36:26 : INFO : qgis-pr : found app at /Applications/QGIS.app, version 3.24.1, on versionKey CFBundleShortVersionString 2022-03-22 16:36:26 : INFO : qgis-pr : appversion: 3.24.1 2022-03-22 16:36:26 : INFO : qgis-pr : Latest version of QGIS is 3.24.1 2022-03-22 16:36:26 : INFO : qgis-pr : There is no newer version available. 2022-03-22 16:36:26 : INFO : qgis-pr : App not closed, so no reopen. 2022-03-22 16:36:26 : REQ : qgis-pr : No newer version. 2022-03-22 16:36:26 : REQ : qgis-pr : ################## End Installomator, exit code 0 ``` --- fragments/labels/qgis-pr.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fragments/labels/qgis-pr.sh diff --git a/fragments/labels/qgis-pr.sh b/fragments/labels/qgis-pr.sh new file mode 100644 index 0000000..0c29be1 --- /dev/null +++ b/fragments/labels/qgis-pr.sh @@ -0,0 +1,7 @@ +qgis-pr) + name="QGIS" + type="dmg" + downloadURL="https://download.qgis.org/downloads/macos/qgis-macos-pr.dmg" + appNewVersion="$(curl -fs "https://www.qgis.org/da/_static/documentation_options.js" | grep -i version | cut -d "'" -f2)" + expectedTeamID="4F7N4UDA22" + ;; From 37f6290d34e75a1db1dd1f671c7bd4b3524b0963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 23 Mar 2022 14:04:43 +0100 Subject: [PATCH 09/91] firefoxpkg_intl Trying to determine the language of the user, and then installing that localized version, instead of en_US. But it will fall back to en_US if something goes wrong. --- fragments/labels/firefoxpkg_intl.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 fragments/labels/firefoxpkg_intl.sh diff --git a/fragments/labels/firefoxpkg_intl.sh b/fragments/labels/firefoxpkg_intl.sh new file mode 100644 index 0000000..3e029ce --- /dev/null +++ b/fragments/labels/firefoxpkg_intl.sh @@ -0,0 +1,24 @@ +firefoxpkg_intl) + # This label will try to figure out the selected language of the user, + # and install corrosponding version of Firefox ESR + name="Firefox" + type="pkg" + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale) + printlog "Found language $userLanguage to be used for Firefox." WARN + 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." WARN + downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=$userLanguage" + # https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US + if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then + printlog "Download not found for that language. Using en-US" WARN + downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US" + fi + appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location | cut -d "/" -f7) + expectedTeamID="43AQ936H96" + blockingProcesses=( firefox ) + ;; From affe0f4073e79cca46312de05e1b74ca6c805f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 23 Mar 2022 14:11:05 +0100 Subject: [PATCH 10/91] log levels on localization --- fragments/labels/firefox_intl.sh | 6 +++--- fragments/labels/firefoxesr_intl.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fragments/labels/firefox_intl.sh b/fragments/labels/firefox_intl.sh index 0218c04..3af441a 100644 --- a/fragments/labels/firefox_intl.sh +++ b/fragments/labels/firefox_intl.sh @@ -4,17 +4,17 @@ firefox_intl) name="Firefox" type="dmg" userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale) - printlog "Found language $userLanguage to be used for Firefox." + printlog "Found language $userLanguage to be used for Firefox." WARN 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." + printlog "Using language $userLanguage for download." WARN 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" + printlog "Download not found for that language. Using en-US" WARN downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US" fi appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep ' Date: Wed, 23 Mar 2022 16:14:35 +0100 Subject: [PATCH 11/91] CraftManager for Sketch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Result: ``` ➜ Installomator/utils/assemble.sh craftmanagerforsketch DEBUG=0 INSTALL=force 2022-03-23 16:12:43 : WARN : craftmanagerforsketch : setting variable from argument DEBUG=0 2022-03-23 16:12:43 : WARN : craftmanagerforsketch : setting variable from argument INSTALL=force 2022-03-23 16:12:43 : REQ : craftmanagerforsketch : ################## Start Installomator v. 10dev, date 2022-03-23 2022-03-23 16:12:43 : INFO : craftmanagerforsketch : ################## Version: 10dev 2022-03-23 16:12:43 : INFO : craftmanagerforsketch : ################## Date: 2022-03-23 2022-03-23 16:12:43 : INFO : craftmanagerforsketch : ################## craftmanagerforsketch 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : BLOCKING_PROCESS_ACTION=tell_user 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : NOTIFY=success 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : LOGGING=INFO 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : Label type: zip 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : archiveName: CraftManager.zip 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : no blocking processes defined, using CraftManager as default 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : App(s) found: /Applications/CraftManager.app 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : found app at /Applications/CraftManager.app, version 1.1.1, on versionKey CFBundleShortVersionString 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : appversion: 1.1.1 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : Label is not of type “updateronly”, and it’s set to use force to install or ignoring app store apps, so not using updateTool. 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : Latest version of CraftManager is 1.1.1 2022-03-23 16:12:44 : INFO : craftmanagerforsketch : There is no newer version available. 2022-03-23 16:12:44 : REQ : craftmanagerforsketch : Downloading https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip to CraftManager.zip 2022-03-23 16:13:06 : REQ : craftmanagerforsketch : no more blocking processes, continue with update 2022-03-23 16:13:06 : REQ : craftmanagerforsketch : Installing CraftManager 2022-03-23 16:13:06 : INFO : craftmanagerforsketch : Unzipping CraftManager.zip 2022-03-23 16:13:06 : INFO : craftmanagerforsketch : Verifying: /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.JOfEecvm/CraftManager.app 2022-03-23 16:13:07 : INFO : craftmanagerforsketch : Team ID matching: VRXQSNCL5W (expected: VRXQSNCL5W ) 2022-03-23 16:13:07 : INFO : craftmanagerforsketch : Downloaded version of CraftManager is 1.1.1 on versionKey CFBundleShortVersionString, same as installed. 2022-03-23 16:13:07 : INFO : craftmanagerforsketch : Using force to install anyway. 2022-03-23 16:13:07 : INFO : craftmanagerforsketch : App has LSMinimumSystemVersion: 10.15 2022-03-23 16:13:07 : WARN : craftmanagerforsketch : Removing existing /Applications/CraftManager.app 2022-03-23 16:13:07 : INFO : craftmanagerforsketch : Copy /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.JOfEecvm/CraftManager.app to /Applications 2022-03-23 16:13:07 : WARN : craftmanagerforsketch : Changing owner to st 2022-03-23 16:13:08 : INFO : craftmanagerforsketch : Finishing... 2022-03-23 16:13:18 : INFO : craftmanagerforsketch : App(s) found: /Applications/CraftManager.app 2022-03-23 16:13:18 : INFO : craftmanagerforsketch : found app at /Applications/CraftManager.app, version 1.1.1, on versionKey CFBundleShortVersionString 2022-03-23 16:13:18 : REQ : craftmanagerforsketch : Installed CraftManager, version 1.1.1 2022-03-23 16:13:18 : INFO : craftmanagerforsketch : notifying 2022-03-23 16:13:18 : INFO : craftmanagerforsketch : App not closed, so no reopen. 2022-03-23 16:13:18 : REQ : craftmanagerforsketch : All done! 2022-03-23 16:13:18 : REQ : craftmanagerforsketch : ################## End Installomator, exit code 0 ➜ Installomator/utils/assemble.sh craftmanagerforsketch DEBUG=0 2022-03-23 16:13:23 : WARN : craftmanagerforsketch : setting variable from argument DEBUG=0 2022-03-23 16:13:23 : REQ : craftmanagerforsketch : ################## Start Installomator v. 10dev, date 2022-03-23 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : ################## Version: 10dev 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : ################## Date: 2022-03-23 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : ################## craftmanagerforsketch 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : BLOCKING_PROCESS_ACTION=tell_user 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : NOTIFY=success 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : LOGGING=INFO 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : Label type: zip 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : archiveName: CraftManager.zip 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : no blocking processes defined, using CraftManager as default 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : App(s) found: /Applications/CraftManager.app 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : found app at /Applications/CraftManager.app, version 1.1.1, on versionKey CFBundleShortVersionString 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : appversion: 1.1.1 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : Latest version of CraftManager is 1.1.1 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : There is no newer version available. 2022-03-23 16:13:23 : INFO : craftmanagerforsketch : App not closed, so no reopen. 2022-03-23 16:13:23 : REQ : craftmanagerforsketch : No newer version. 2022-03-23 16:13:23 : REQ : craftmanagerforsketch : ################## End Installomator, exit code 0 ``` --- fragments/labels/craftmanagerforsketch.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fragments/labels/craftmanagerforsketch.sh diff --git a/fragments/labels/craftmanagerforsketch.sh b/fragments/labels/craftmanagerforsketch.sh new file mode 100644 index 0000000..26e70d3 --- /dev/null +++ b/fragments/labels/craftmanagerforsketch.sh @@ -0,0 +1,7 @@ +craftmanagerforsketch) + name="CraftManager" + type="zip" + downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip" + appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2) + expectedTeamID="VRXQSNCL5W" + ;; From a058a6594b45871d261cf8dd9b0c8f6aecdb7e56 Mon Sep 17 00:00:00 2001 From: Bradley Benkle Date: Thu, 24 Mar 2022 17:05:44 -0400 Subject: [PATCH 12/91] Create androidstudio.sh --- fragments/labels/androidstudio.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 fragments/labels/androidstudio.sh diff --git a/fragments/labels/androidstudio.sh b/fragments/labels/androidstudio.sh new file mode 100644 index 0000000..2fe2307 --- /dev/null +++ b/fragments/labels/androidstudio.sh @@ -0,0 +1,13 @@ +androidstudio) + name="Android Studio" + type="dmg" + if [[ $(arch) == arm64 ]]; then + downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i arm.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1) + appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' ) + elif [[ $(arch) == i386 ]]; then + downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i mac.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1) + appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' ) + fi + expectedTeamID="EQHXZ8M8AV" + blockingProcesses=( androidstudio ) + ;; \ No newline at end of file From a4b02197d8d65a22eacff5bb496496fc35066388 Mon Sep 17 00:00:00 2001 From: Bradley Benkle Date: Fri, 25 Mar 2022 14:37:23 -0400 Subject: [PATCH 13/91] Update postman.sh --- fragments/labels/postman.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fragments/labels/postman.sh b/fragments/labels/postman.sh index e2a6685..4fc3285 100644 --- a/fragments/labels/postman.sh +++ b/fragments/labels/postman.sh @@ -1,8 +1,12 @@ postman) - # credit: Mischa van der Bent 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:]\t]//g' ) + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://dl.pstmn.io/download/latest/osx_arm64" + appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/') + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://dl.pstmn.io/download/latest/osx_64" + appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/') + fi expectedTeamID="H7H8Q7M5CK" - ;; + ;; \ No newline at end of file From 02435b25ad2524366e1600d4e734d2f8d3055d9a Mon Sep 17 00:00:00 2001 From: Bradley Benkle Date: Tue, 29 Mar 2022 11:23:59 -0400 Subject: [PATCH 14/91] Update amazoncorretto8jdk.sh --- fragments/labels/amazoncorretto8jdk.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fragments/labels/amazoncorretto8jdk.sh b/fragments/labels/amazoncorretto8jdk.sh index 0fc4037..48d6b5e 100644 --- a/fragments/labels/amazoncorretto8jdk.sh +++ b/fragments/labels/amazoncorretto8jdk.sh @@ -1,7 +1,12 @@ amazoncorretto8jdk) name="Amazon Corretto 8 JDK" type="pkg" - downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg" - appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}') + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-aarch64-macos-jdk.pkg" + appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}') + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg" + appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}') + fi expectedTeamID="94KV3E626L" -;; +;; \ No newline at end of file From 7fa9d3c24aa7e375e6f99009e6e8f6ab9ebb8c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 30 Mar 2022 13:25:23 +0200 Subject: [PATCH 15/91] Zoho WorkDrive Genie MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` ➜ Installomator/utils/assemble.sh zohoworkdrivegenie DEBUG=0 INSTALL=force 2022-03-30 13:20:44 : WARN : zohoworkdrivegenie : setting variable from argument DEBUG=0 2022-03-30 13:20:44 : WARN : zohoworkdrivegenie : setting variable from argument INSTALL=force 2022-03-30 13:20:44 : REQ : zohoworkdrivegenie : ################## Start Installomator v. 10dev, date 2022-03-30 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : ################## Version: 10dev 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : ################## Date: 2022-03-30 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : ################## zohoworkdrivegenie 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : BLOCKING_PROCESS_ACTION=tell_user 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : NOTIFY=success 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : LOGGING=INFO 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : Label type: dmg 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : archiveName: Zoho WorkDrive Genie.dmg 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : no blocking processes defined, using Zoho WorkDrive Genie as default 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : App(s) found: /Applications/Zoho WorkDrive Genie.app 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : found app at /Applications/Zoho WorkDrive Genie.app, version 1.0, on versionKey CFBundleShortVersionString 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : appversion: 1.0 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : Label is not of type “updateronly”, and it’s set to use force to install or ignoring app store apps, so not using updateTool. 2022-03-30 13:20:44 : INFO : zohoworkdrivegenie : Latest version not specified. 2022-03-30 13:20:44 : REQ : zohoworkdrivegenie : Downloading https://www.zoho.com/workdrive/downloads/edit-tool/Zoho_WorkDrive_Genie.dmg to Zoho WorkDrive Genie.dmg 2022-03-30 13:20:49 : REQ : zohoworkdrivegenie : no more blocking processes, continue with update 2022-03-30 13:20:49 : REQ : zohoworkdrivegenie : Installing Zoho WorkDrive Genie 2022-03-30 13:20:49 : INFO : zohoworkdrivegenie : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.J1mdaQJZ/Zoho WorkDrive Genie.dmg 2022-03-30 13:20:52 : INFO : zohoworkdrivegenie : Mounted: /Volumes/Zoho WorkDrive Genie 2022-03-30 13:20:52 : INFO : zohoworkdrivegenie : Verifying: /Volumes/Zoho WorkDrive Genie/Zoho WorkDrive Genie.app 2022-03-30 13:20:54 : INFO : zohoworkdrivegenie : Team ID matching: TZ824L8Y37 (expected: TZ824L8Y37 ) 2022-03-30 13:20:54 : INFO : zohoworkdrivegenie : Downloaded version of Zoho WorkDrive Genie is 1.0 on versionKey CFBundleShortVersionString, same as installed. 2022-03-30 13:20:54 : INFO : zohoworkdrivegenie : Using force to install anyway. 2022-03-30 13:20:54 : INFO : zohoworkdrivegenie : App has LSMinimumSystemVersion: 10.13 2022-03-30 13:20:54 : INFO : zohoworkdrivegenie : CLIInstaller exists, running installer command /Volumes/Zoho WorkDrive Genie/Zoho WorkDrive Genie.app/Contents/MacOS/Zoho WorkDrive Genie 2022-03-30 13:21:00 : INFO : zohoworkdrivegenie : Succesfully ran /Volumes/Zoho WorkDrive Genie/Zoho WorkDrive Genie.app/Contents/MacOS/Zoho WorkDrive Genie 2022-03-30 13:21:00 : INFO : zohoworkdrivegenie : Finishing... 2022-03-30 13:21:10 : INFO : zohoworkdrivegenie : App(s) found: /Applications/Zoho WorkDrive Genie.app 2022-03-30 13:21:10 : INFO : zohoworkdrivegenie : found app at /Applications/Zoho WorkDrive Genie.app, version 1.0, on versionKey CFBundleShortVersionString 2022-03-30 13:21:10 : REQ : zohoworkdrivegenie : Installed Zoho WorkDrive Genie, version 1.0 2022-03-30 13:21:10 : INFO : zohoworkdrivegenie : notifying 2022-03-30 13:21:11 : INFO : zohoworkdrivegenie : App not closed, so no reopen. 2022-03-30 13:21:11 : REQ : zohoworkdrivegenie : All done! 2022-03-30 13:21:11 : REQ : zohoworkdrivegenie : ################## End Installomator, exit code 0 ``` --- fragments/labels/zohoworkdrivegenie.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fragments/labels/zohoworkdrivegenie.sh diff --git a/fragments/labels/zohoworkdrivegenie.sh b/fragments/labels/zohoworkdrivegenie.sh new file mode 100644 index 0000000..9861324 --- /dev/null +++ b/fragments/labels/zohoworkdrivegenie.sh @@ -0,0 +1,8 @@ +zohoworkdrivegenie) + name="Zoho WorkDrive Genie" + type="dmg" + # https://www.zoho.com/workdrive/genie.html + downloadURL="https://www.zoho.com/workdrive/downloads/edit-tool/Zoho_WorkDrive_Genie.dmg" + CLIInstaller="Zoho WorkDrive Genie.app/Contents/MacOS/Zoho WorkDrive Genie" + expectedTeamID="TZ824L8Y37" + ;; From f8a3104470bacb371fd1566dbe822e92d08a779b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 30 Mar 2022 13:39:23 +0200 Subject: [PATCH 16/91] MDM scripts updated --- MDM/App script.sh | 40 ++++++++++++++------- MDM/App-loop script.sh | 50 +++++++++++++++++--------- MDM/Installomator update.sh | 46 ++++++++++++------------ MDM/MDMAddigy CustomSoftware.sh | 53 ++++++++++++++++++---------- MDM/MDMMosyle install.sh | 22 +++++++----- MDM/Manual valuesfromarguments.sh | 58 +++++++++++++++++++------------ 6 files changed, 167 insertions(+), 102 deletions(-) diff --git a/MDM/App script.sh b/MDM/App script.sh index a33a43a..c7b4a10 100755 --- a/MDM/App script.sh +++ b/MDM/App script.sh @@ -5,8 +5,28 @@ what="brave" # enter the software to install # To be used as a script sent out from a MDM. # Fill the variable "what" above with a label. # Script will run this label. +LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem" +###################################################################### +# Parameters for reinstall/initial install (owner root:wheel): +# "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1" +# Parameters for Self Service installed app: +# "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all" +# Parameters for security important apps, like browsers (run automaticaly every day): +# "BLOCKING_PROCESS_ACTION=tell_user_then_kill" +# Update of service apps (run automatically): +# "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent" +parameters="BLOCKING_PROCESS_ACTION=tell_user_then_kill NOTIFY=all" ############################################### +# Verify that Installomator has been installed +destFile="/usr/local/Installomator/Installomator.sh" +if [ ! -e "${destFile}" ]; then + echo "Installomator not found here:" + echo "${destFile}" + echo "Exiting." + exit 99 +fi + # No sleeping /usr/bin/caffeinate -d -i -m -u & caffeinatepid=$! @@ -16,18 +36,14 @@ caffexit () { exit $1 } -# Verify that Installomator has been installed -destFile="/usr/local/Installomator/Installomator.sh" -if [ ! -e "${destFile}" ]; then - echo "Installomator not found here:" - echo "${destFile}" - echo "Exiting." - caffexit 99 -fi - -${destFile} ${what} LOGO=mosyleb BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=all #INSTALL=force -if [ $? != 0 ]; then -# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle! +cmdOutput="$(${destFile} ${what} LOGO=$LOGO $parameters LOGGING=WARN || true)" +# Check result +exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" +if [[ ${exitStatus} -ne 0 ]] ; then + echo -e "Error installing ${what}. Exit code ${exitStatus}" + #echo "$cmdOutput" + errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" + echo "$errorOutput" echo "Error installing ${what}. Exit code $?" caffexit $? fi diff --git a/MDM/App-loop script.sh b/MDM/App-loop script.sh index 17ce761..8fb33e7 100755 --- a/MDM/App-loop script.sh +++ b/MDM/App-loop script.sh @@ -1,11 +1,31 @@ #!/bin/zsh # Installation using Installomator -what="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal" # enter the software to install separated with spaces +whatList="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal" # enter the software to install separated with spaces # To be used as a script sent out from a MDM. -# Fill the variable "what" above with labels separated by space " ". +# Fill the variable "whatList" above with labels separated by space " ". # Script will loop through these labels. +LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem" ###################################################################### +# Parameters for reinstall/initial install (owner root:wheel): +# "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1" +# Parameters for Self Service installed app: +# "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all" +# Parameters for security important apps, like browsers (run automaticaly every day): +# "BLOCKING_PROCESS_ACTION=tell_user_then_kill" +# Update of service apps (run automatically): +# "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent" +parameters="BLOCKING_PROCESS_ACTION=tell_user NOTIFY=all" +###################################################################### + +# Verify that Installomator has been installed +destFile="/usr/local/Installomator/Installomator.sh" +if [ ! -e "${destFile}" ]; then + echo "Installomator not found here:" + echo "${destFile}" + echo "Exiting." + exit 99 +fi # No sleeping /usr/bin/caffeinate -d -i -m -u & @@ -19,21 +39,17 @@ caffexit () { # Count errors errorCount=0 -# Verify that Installomator has been installed -destFile="/usr/local/Installomator/Installomator.sh" -if [ ! -e "${destFile}" ]; then - echo "Installomator not found here:" - echo "${destFile}" - echo "Exiting." - caffexit 99 -fi - -for item in $what; do - #echo $item - ${destFile} ${item} LOGO=mosyleb BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=all #INSTALL=force - if [ $? != 0 ]; then - # This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle! - echo "[$(DATE)] Error installing ${item}. Exit code $?" +for what in $whatList; do + #echo $what + # Install software using Installomator + cmdOutput="$(${destFile} ${what} LOGO=$LOGO $parameters LOGGING=WARN || true)" + # Check result + exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" + if [[ ${exitStatus} -ne 0 ]] ; then + echo -e "Error installing ${what}. Exit code ${exitStatus}" + #echo "$cmdOutput" + errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" + echo "$errorOutput" let errorCount++ fi done diff --git a/MDM/Installomator update.sh b/MDM/Installomator update.sh index 70fe71f..5b6bb67 100755 --- a/MDM/Installomator update.sh +++ b/MDM/Installomator update.sh @@ -1,9 +1,18 @@ #!/bin/bash # Updating Installomator # Usefull to push out after deployment if earlier version was deployed in DEP profile -# Currently script uses valuesfromarguments as a label is not included before next release, so this can be used to install to version 0.7 what="installomator" # enter the software to install +LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem" + +# Verify that Installomator has been installed +destFile="/usr/local/Installomator/Installomator.sh" +if [ ! -e "${destFile}" ]; then + echo "Installomator not found here:" + echo "${destFile}" + echo "Exiting." + exit 99 +fi # No sleeping /usr/bin/caffeinate -d -i -m -u & @@ -14,30 +23,19 @@ caffexit () { exit $1 } -# Verify that Installomator has been installed -destFile="/usr/local/Installomator/Installomator.sh" -if [ ! -e "${destFile}" ]; then - echo "Installomator not found here:" - echo "${destFile}" - echo "Exiting." - caffexit 99 -fi +# Install software using Installomator +cmdOutput="$(${destFile} ${what} LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent LOGGING=req || true)" -${destFile} valuesfromarguments\ - name=Installomator \ - type=pkg \ - packageID=com.scriptingosx.Installomator \ - downloadURL=https://github.com/Installomator/Installomator/releases/download/v0.7release/Installomator-0.7.0.pkg \ - appNewVersion=0.7 \ - expectedTeamID=JME5BW3F3R \ - BLOCKING_PROCESS_ACTION=ignore \ - NOTIFY=silent - -# ${destFile} ${what} BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent -if [ $? != 0 ]; then -# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle! - echo "Error installing ${what}. Exit code $?" - caffexit $? +# Check result +exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" +if [[ ${exitStatus} -eq 0 ]] ; then + echo -e "${what} succesfully installed.\n" +else + echo -e "Error installing ${what}. Exit code ${exitStatus}\n" + #echo "$cmdOutput" + errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" + echo "$errorOutput" + caffexit $exitStatus fi echo "[$(DATE)][LOG-END]" diff --git a/MDM/MDMAddigy CustomSoftware.sh b/MDM/MDMAddigy CustomSoftware.sh index 8feb85a..e7918fd 100755 --- a/MDM/MDMAddigy CustomSoftware.sh +++ b/MDM/MDMAddigy CustomSoftware.sh @@ -5,15 +5,34 @@ # Mark: Installation script # Just click “Add” to autogenerate the installer script line by clicking the “Add”-button next to the Installer PKG, replace with first line below -/usr/sbin/installer -pkg "/Library/Addigy/ansible/packages/Installomator (0.7.0)/Installomator-0.7.0.pkg" -target / +/usr/sbin/installer -pkg "/Library/Addigy/ansible/packages/Installomator (9.1.0)/Installomator-9.1.pkg" -target / # Installation using Installomator -what="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the software to installed separated with spaces +whatList="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the software to installed separated with spaces # To be used as a script sent out from a MDM. -# Fill the variable "what" above with labels separated by space " ". +# Fill the variable "whatList" above with labels separated by space " ". # Script will loop through these labels and exit with number of errors. ###################################################################### +# Parameters for reinstall/initial install (owner root:wheel): +# "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1" +# Parameters for Self Service installed app: +# "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all" +# Parameters for security important apps, like browsers (run automaticaly every day): +# "BLOCKING_PROCESS_ACTION=tell_user_then_kill" +# Update of service apps (run automatically): +# "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent" +parameters="BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes" +###################################################################### + +# Verify that Installomator has been installed +destFile="/usr/local/Installomator/Installomator.sh" +if [ ! -e "${destFile}" ]; then + echo "Installomator not found here:" + echo "${destFile}" + echo "Exiting." + exit 99 +fi # No sleeping /usr/bin/caffeinate -d -i -m -u & @@ -27,21 +46,17 @@ caffexit () { # Count errors errorCount=0 -# Verify that Installomator has been installed -destFile="/usr/local/Installomator/Installomator.sh" -if [ ! -e "${destFile}" ]; then - echo "Installomator not found here:" - echo "${destFile}" - echo "Exiting." - caffexit 99 -fi - -for item in $what; do - #echo $item - ${destFile} ${item} LOGO=addigy NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill #INSTALL=force - if [ $? != 0 ]; then - # Error handling - echo "[$(DATE)] Error installing ${item}. Exit code $?" +for what in $whatList; do + #echo $what + # Install software using Installomator + cmdOutput="$(${destFile} ${what} LOGO=addigy $parameters || true)" + # Check result + exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" + if [[ ${exitStatus} -ne 0 ]] ; then + echo -e "Error installing ${what}. Exit code ${exitStatus}" + #echo "$cmdOutput" + errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" + echo "$errorOutput" let errorCount++ fi done @@ -56,7 +71,7 @@ caffexit $errorCount # Install on success # Remember to fill out the correct “TARGET_VERSION” and “PKG_ID”, and click "Install on succes". PKG_ID="com.scriptingosx.Installomator" -TARGET_VERSION="8.0" +TARGET_VERSION="9.1" vercomp () { if [[ $1 == $2 ]]; then diff --git a/MDM/MDMMosyle install.sh b/MDM/MDMMosyle install.sh index 6c6f9ca..27f9d8d 100644 --- a/MDM/MDMMosyle install.sh +++ b/MDM/MDMMosyle install.sh @@ -1,10 +1,11 @@ PKG_ID="com.scriptingosx.Installomator" -TARGET_VERSION="8.0" +TARGET_VERSION="9.1" URLDOWNLOAD="%MosyleCDNFile:blah-blah-blah%" ###################################################################### -# Installation using Installomator (enter the software to install separated with spaces in the "what"-variable) -what="handbrake theunarchiver microsoftoffice365" +# Installation using Installomator (enter the software to install separated with spaces in the "whatList"-variable) +whatList="handbrake theunarchiver microsoftoffice365" # Covered by Mosyle Catalog: "brave firefox googlechrome microsoftedge microsoftteams signal sublimetext vlc webex zoom" among others +LOGO="mosyleb" # or "mosylem" ###################################################################### ## Mark: Code here @@ -56,12 +57,17 @@ if [ ! -e "${destFile}" ]; then caffexit 99 fi -for item in $what; do +for what in $whatList; do #echo $item - ${destFile} ${item} LOGO=mosyle NOTIFY=all BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill #INSTALL=force - if [ $? != 0 ]; then - # Error handling - echo "[$(DATE)] Error installing ${item}. Exit code $?" + # Install software using Installomator + cmdOutput="$(${destFile} ${what} LOGO=$LOGO NOTIFY=all BLOCKING_PROCESS_ACTION=tell_user || true)" # NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force + # Check result + exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" + if [[ ${exitStatus} -ne 0 ]] ; then + echo "Error installing ${what}. Exit code ${exitStatus}" + #echo "$cmdOutput" + errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" + echo "$errorOutput" let errorCount++ fi done diff --git a/MDM/Manual valuesfromarguments.sh b/MDM/Manual valuesfromarguments.sh index 706f81f..ee80291 100755 --- a/MDM/Manual valuesfromarguments.sh +++ b/MDM/Manual valuesfromarguments.sh @@ -1,8 +1,20 @@ #!/bin/bash +# Software + # Installation using Installomator # Example of installing software using valuesfromarguments to install a custom software -what="valuesfromarguments" # enter the software to install +LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem" +############################################### + +# Verify that Installomator has been installed +destFile="/usr/local/Installomator/Installomator.sh" +if [ ! -e "${destFile}" ]; then + echo "Installomator not found here:" + echo "${destFile}" + echo "Exiting." + exit 99 +fi # No sleeping /usr/bin/caffeinate -d -i -m -u & @@ -13,29 +25,31 @@ caffexit () { exit $1 } -# Verify that Installomator has been installed -destFile="/usr/local/Installomator/Installomator.sh" -if [ ! -e "${destFile}" ]; then - echo "Installomator not found here:" - echo "${destFile}" - echo "Exiting." - caffexit 99 -fi +# Variables to calculate +downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip" +appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath -e '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2) -${destFile} valuesfromarguments \ - name=\"Zoho\ WorkDrive\" \ - type=dmg \ - downloadURL=https://files-accl.zohopublic.com/public/wdbin/download/46f971e4fc4a32b68ad5d7dade38a7d2 \ - appNewVersion=2.6.25 \ - expectedTeamID=TZ824L8Y37 \ - BLOCKING_PROCESS_ACTION=quit \ - NOTIFY=all +# Install software using Installomator +cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \ + name=CraftManager \ + type=zip \ + downloadURL=$downloadURL \ + appNewVersion=$appNewVersion \ + expectedTeamID=VRXQSNCL5W \ + BLOCKING_PROCESS_ACTION=prompt_user \ + LOGGING=REQ \ + NOTIFY=all || true)" -# ${destFile} ${what} BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent -if [ $? != 0 ]; then -# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle! - echo "Error installing ${what}. Exit code $?" - caffexit $? +# Check result +exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )" +if [[ ${exitStatus} -eq 0 ]] ; then + echo -e "${what} succesfully installed.\n" +else + echo -e "Error installing ${what}. Exit code ${exitStatus}\n" + #printlog "$cmdOutput" + errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )" + echo "$errorOutput" + caffexit $exitStatus fi echo "[$(DATE)][LOG-END]" From 5109597f1a3d527ea2a85c0be826dc34ca17dcf6 Mon Sep 17 00:00:00 2001 From: Maarten Wijnants Date: Thu, 31 Mar 2022 08:44:52 +0200 Subject: [PATCH 17/91] Add latest version check to firefoxpkg --- fragments/labels/firefoxpkg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/fragments/labels/firefoxpkg.sh b/fragments/labels/firefoxpkg.sh index ef40811..599c2c0 100644 --- a/fragments/labels/firefoxpkg.sh +++ b/fragments/labels/firefoxpkg.sh @@ -2,6 +2,7 @@ firefoxpkg) name="Firefox" type="pkg" downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US" + appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep ' Date: Fri, 1 Apr 2022 16:36:18 +0200 Subject: [PATCH 18/91] Update 'rancherdesktop' to support arm64 The `archiveName` was no longer valid. Added support for i386 and arm64. Also made `name` look more beautiful :-) --- fragments/labels/rancherdesktop.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fragments/labels/rancherdesktop.sh b/fragments/labels/rancherdesktop.sh index b61760e..8084be6 100644 --- a/fragments/labels/rancherdesktop.sh +++ b/fragments/labels/rancherdesktop.sh @@ -1,8 +1,13 @@ rancherdesktop) - name="Rancher.Desktop-1.0.0-mac" + name="Rancher Desktop" type="zip" - archiveName="Rancher.Desktop-[0-9.]*-mac.zip" - downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)" + if [[ $(arch) == "arm64" ]]; then + archiveName="Rancher.Desktop-[0-9.]*-mac.aarch64.zip" + downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)" + elif [[ $(arch) == "i386" ]]; then + archiveName="Rancher.Desktop-[0-9.]*-mac.x86_64.zip" + downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)" + fi appNewVersion="$(versionFromGit rancher-sandbox rancher-desktop)" expectedTeamID="2Q6FHJR3H3" appName="Rancher Desktop.app" From 229e2c76bb85c5a32b8ee43c213748ab15105a9a Mon Sep 17 00:00:00 2001 From: Gabe Marchan Date: Mon, 4 Apr 2022 11:09:05 -0500 Subject: [PATCH 19/91] Add aText Legacy which provides aText 2 for those with older licenses. --- Installomator.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Installomator.sh b/Installomator.sh index 3f64473..66c0572 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1564,6 +1564,13 @@ atext) downloadURL="https://trankynam.com/atext/downloads/aText.dmg" expectedTeamID="KHEMQ2FD9E" ;; +atextlegacy) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="aText" + type="dmg" + downloadURL="https://trankynam.com/atext/downloads/aTextLegacy.dmg" + expectedTeamID="KHEMQ2FD9E" + ;; atom) name="Atom" type="zip" From 351cc07afaf9d6ba7db605ba0bb8644b48af1acf Mon Sep 17 00:00:00 2001 From: Maarten Wijnants Date: Tue, 5 Apr 2022 16:12:08 +0200 Subject: [PATCH 20/91] Add latest version check to gpgsuite --- fragments/labels/gpgsuite.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/fragments/labels/gpgsuite.sh b/fragments/labels/gpgsuite.sh index d2066bb..e14cd68 100644 --- a/fragments/labels/gpgsuite.sh +++ b/fragments/labels/gpgsuite.sh @@ -4,6 +4,7 @@ gpgsuite) type="pkgInDmg" pkgName="Install.pkg" downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4) + appNewVersion=$(echo $downloadURL | cut -d "-" -f 2 | cut -d "." -f 1-2) expectedTeamID="PKV8ZPD836" blockingProcesses=( "GPG Keychain" ) ;; From 3578f9cbe92fd669a294e92ca2063762e19fcb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 5 Apr 2022 20:05:47 +0200 Subject: [PATCH 21/91] Extra logging for firefox and googlechrome labels. --- fragments/labels/firefox.sh | 1 + fragments/labels/firefox_da.sh | 1 + fragments/labels/firefox_intl.sh | 1 + fragments/labels/googlechrome.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/fragments/labels/firefox.sh b/fragments/labels/firefox.sh index 5bfdaef..7b310e5 100644 --- a/fragments/labels/firefox.sh +++ b/fragments/labels/firefox.sh @@ -5,4 +5,5 @@ firefox) appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep ' Date: Fri, 8 Apr 2022 08:20:51 +0200 Subject: [PATCH 22/91] Update logitechoptions.sh Application name change --- fragments/labels/logitechoptions.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fragments/labels/logitechoptions.sh b/fragments/labels/logitechoptions.sh index 14a2a8a..ffd4cf9 100644 --- a/fragments/labels/logitechoptions.sh +++ b/fragments/labels/logitechoptions.sh @@ -1,5 +1,6 @@ +logioptions|\ logitechoptions) - name="Logitech Options" + name="Logi Options" type="pkgInZip" #downloadURL=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options/.*\.zip" | head -1) downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.zip" From ed07b2af2bffca60ea9eb843f26454b560aee9df Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:06:42 +0200 Subject: [PATCH 23/91] Create MindManager Label MindJet MindManager Label --- fragments/labels/mindmanager.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fragments/labels/mindmanager.sh diff --git a/fragments/labels/mindmanager.sh b/fragments/labels/mindmanager.sh new file mode 100644 index 0000000..69e47be --- /dev/null +++ b/fragments/labels/mindmanager.sh @@ -0,0 +1,7 @@ +mindmanager) + name="MindManager" + type="dmg" + downloadURL="https://www.mindmanager.com/mm-mac-dmg" + appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*_Mac_*([0-9.]*)\..*/\1/g')" + expectedTeamID="ZF6ZZ779N5" + ;; From 1c2d8d9c17598cf8573f3cb4262b9cfe66a49638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Fri, 8 Apr 2022 21:14:49 +0200 Subject: [PATCH 24/91] Fixed `downloadURL` in sketch --- fragments/labels/sketch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/sketch.sh b/fragments/labels/sketch.sh index 7cf3b9a..c8ab750 100644 --- a/fragments/labels/sketch.sh +++ b/fragments/labels/sketch.sh @@ -1,7 +1,7 @@ sketch) name="Sketch" type="zip" - downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g') + downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | tr '"' "\n" | grep -E "https.*.zip") appNewVersion=$(curl -fs https://www.sketch.com/updates/ | grep "Sketch Version" | head -1 | sed -E 's/.*Version ([0-9.]*)<.*/\1/g') # version from update page expectedTeamID="WUGMZZ5K46" ;; From 0f892f5868407210f639119fb0acf19ee5fc720d Mon Sep 17 00:00:00 2001 From: Sam Ess Date: Fri, 8 Apr 2022 19:20:26 -0400 Subject: [PATCH 25/91] Add draw.io label --- fragments/labels/drawio.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fragments/labels/drawio.sh diff --git a/fragments/labels/drawio.sh b/fragments/labels/drawio.sh new file mode 100644 index 0000000..16581f2 --- /dev/null +++ b/fragments/labels/drawio.sh @@ -0,0 +1,8 @@ +drawio) + name="draw.io" + type="dmg" + archiveName="draw.io-universal-[0-9.]*.dmg" + downloadURL="$(downloadURLFromGit jgraph drawio-desktop)" + appNewVersion="$(versionFromGit jgraph drawio-desktop)" + expectedTeamID="UZEUFB4N53" + ;; \ No newline at end of file From 8ff6a0f9ca4eda030759265480748d960003c3f8 Mon Sep 17 00:00:00 2001 From: Sam Ess Date: Fri, 8 Apr 2022 19:29:16 -0400 Subject: [PATCH 26/91] Added draw.io blocking process --- fragments/labels/drawio.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/fragments/labels/drawio.sh b/fragments/labels/drawio.sh index 16581f2..ee2994b 100644 --- a/fragments/labels/drawio.sh +++ b/fragments/labels/drawio.sh @@ -5,4 +5,5 @@ drawio) downloadURL="$(downloadURLFromGit jgraph drawio-desktop)" appNewVersion="$(versionFromGit jgraph drawio-desktop)" expectedTeamID="UZEUFB4N53" + blockingProcesses=( draw.io ) ;; \ No newline at end of file From 2e291eb6c17d12a73e2aedefe2d2763fc9ea2cf3 Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Mon, 11 Apr 2022 13:14:28 +0200 Subject: [PATCH 27/91] Label for both Clue appliations --- fragments/labels/clue.sh | 9 +++++++++ fragments/labels/cluefull.sh | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 fragments/labels/clue.sh create mode 100644 fragments/labels/cluefull.sh diff --git a/fragments/labels/clue.sh b/fragments/labels/clue.sh new file mode 100644 index 0000000..ef54612 --- /dev/null +++ b/fragments/labels/clue.sh @@ -0,0 +1,9 @@ +clue) + #For personal use and students + name="Clue" + type="dmg" + downloadURL=$(curl -fsL https://clue.no/en/download | grep "For personal use and students:" | sed 's/.*href="//' | sed 's/".*//') + appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\..*/\1/g')" + versionKey="CFBundleVersion" + expectedTeamID="3NX6B9TB2F" + ;; diff --git a/fragments/labels/cluefull.sh b/fragments/labels/cluefull.sh new file mode 100644 index 0000000..65abbb7 --- /dev/null +++ b/fragments/labels/cluefull.sh @@ -0,0 +1,9 @@ +cluefull) + #For companies and schools + name="Clue" + type="dmg" + downloadURL=$(curl -fsL https://clue.no/en/download | grep "For companies and schools:" | sed 's/.*href="//' | sed 's/".*//') + appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\F.*/\1/g')" + versionKey="CFBundleVersion" + expectedTeamID="3NX6B9TB2F" + ;; From 237648004aa7250973aa2ab303c1b5ebe45736bb Mon Sep 17 00:00:00 2001 From: 0x4448 <86135470+0x4448@users.noreply.github.com> Date: Wed, 13 Apr 2022 03:44:24 +0000 Subject: [PATCH 28/91] Add latest version check for googlechromepkg --- fragments/labels/googlechromepkg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/fragments/labels/googlechromepkg.sh b/fragments/labels/googlechromepkg.sh index dda15c1..dd6af88 100644 --- a/fragments/labels/googlechromepkg.sh +++ b/fragments/labels/googlechromepkg.sh @@ -6,6 +6,7 @@ googlechromepkg) # https://support.google.com/chrome/a/answer/9915669 # downloadURL="https://dl.google.com/chrome/mac/stable/accept_tos%3Dhttps%253A%252F%252Fwww.google.com%252Fintl%252Fen_ph%252Fchrome%252Fterms%252F%26_and_accept_tos%3Dhttps%253A%252F%252Fpolicies.google.com%252Fterms/googlechrome.pkg" + appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}') expectedTeamID="EQHXZ8M8AV" updateTool="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/GoogleSoftwareUpdateAgent.app/Contents/MacOS/GoogleSoftwareUpdateAgent" updateToolArguments=( -runMode oneshot -userInitiated YES ) From 972a319bb9bb31d1cccacabda3942f4de93438e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 13 Apr 2022 13:33:38 +0200 Subject: [PATCH 29/91] Change the mentioning of members with link to profiles. --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 676cbc0..a13591e 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ We have put a lot of work into making it stable and safe, but we cannot - of cou ## Authors Intallomator was originally inspired by the download scripts from William Smith and Sander Schram, and created by: - Armin Briegel - @scriptingosx +- [Armin Briegel - @scriptingosx](https://github.com/scriptingosx) -Later on a few more contributers came on the project: - Isaac Ordonez - @issacatmann - Søren Theilgaard - @Theile - Adam Codega - @acodega +Later on a few more members came on the project: +- Isaac Ordonez - @issacatmann +- [Søren Theilgaard - @Theile](https://github.com/Theile) +- [Adam Codega - @acodega](https://github.com/acodega) And with numerous contributions from many others. From 79b2b43cd0328beab316dae7f79e1290642790bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 13 Apr 2022 13:57:36 +0200 Subject: [PATCH 30/91] Dropbox with `appNewVersion` Output: ``` sudo /Users/st/Documents/GitHub/Installomator/utils/assemble.sh dropbox DEBUG=0 Password: 2022-04-13 13:55:33 : WARN : dropbox : setting variable from argument DEBUG=0 2022-04-13 13:55:33 : REQ : dropbox : ################## Start Installomator v. 10dev, date 2022-04-13 2022-04-13 13:55:33 : INFO : dropbox : ################## Version: 10dev 2022-04-13 13:55:33 : INFO : dropbox : ################## Date: 2022-04-13 2022-04-13 13:55:33 : INFO : dropbox : ################## dropbox 2022-04-13 13:55:34 : INFO : dropbox : BLOCKING_PROCESS_ACTION=tell_user 2022-04-13 13:55:34 : INFO : dropbox : NOTIFY=success 2022-04-13 13:55:34 : INFO : dropbox : LOGGING=INFO 2022-04-13 13:55:34 : INFO : dropbox : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-04-13 13:55:34 : INFO : dropbox : Label type: dmg 2022-04-13 13:55:34 : INFO : dropbox : archiveName: Dropbox.dmg 2022-04-13 13:55:34 : INFO : dropbox : no blocking processes defined, using Dropbox as default 2022-04-13 13:55:34 : INFO : dropbox : name: Dropbox, appName: Dropbox.app 2022-04-13 13:55:34 : INFO : dropbox : App(s) found: 2022-04-13 13:55:34 : WARN : dropbox : could not find Dropbox.app 2022-04-13 13:55:34 : INFO : dropbox : appversion: 2022-04-13 13:55:34 : INFO : dropbox : Latest version of Dropbox is 145.4.4921 2022-04-13 13:55:34 : REQ : dropbox : Downloading https://www.dropbox.com/download?plat=mac&full=1 to Dropbox.dmg 2022-04-13 13:55:37 : REQ : dropbox : no more blocking processes, continue with update 2022-04-13 13:55:37 : REQ : dropbox : Installing Dropbox 2022-04-13 13:55:37 : INFO : dropbox : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.HdtYqL07/Dropbox.dmg 2022-04-13 13:55:38 : INFO : dropbox : Mounted: /Volumes/Dropbox Offline Installer 2022-04-13 13:55:38 : INFO : dropbox : Verifying: /Volumes/Dropbox Offline Installer/Dropbox.app 2022-04-13 13:55:42 : INFO : dropbox : Team ID matching: G7HH3F8CAK (expected: G7HH3F8CAK ) 2022-04-13 13:55:42 : INFO : dropbox : Installing Dropbox version 145.4.4921 on versionKey CFBundleShortVersionString. 2022-04-13 13:55:42 : INFO : dropbox : App has LSMinimumSystemVersion: 10.10 2022-04-13 13:55:42 : INFO : dropbox : Copy /Volumes/Dropbox Offline Installer/Dropbox.app to /Applications 2022-04-13 13:55:45 : WARN : dropbox : Changing owner to st 2022-04-13 13:55:45 : INFO : dropbox : Finishing... 2022-04-13 13:55:55 : INFO : dropbox : App(s) found: /Applications/Dropbox.app 2022-04-13 13:55:55 : INFO : dropbox : found app at /Applications/Dropbox.app, version 145.4.4921, on versionKey CFBundleShortVersionString 2022-04-13 13:55:55 : REQ : dropbox : Installed Dropbox, version 145.4.4921 2022-04-13 13:55:55 : INFO : dropbox : notifying 2022-04-13 13:55:56 : INFO : dropbox : App not closed, so no reopen. 2022-04-13 13:55:56 : REQ : dropbox : All done! 2022-04-13 13:55:56 : REQ : dropbox : ################## End Installomator, exit code 0 ``` --- fragments/labels/dropbox.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/fragments/labels/dropbox.sh b/fragments/labels/dropbox.sh index 6936d96..06a02b9 100644 --- a/fragments/labels/dropbox.sh +++ b/fragments/labels/dropbox.sh @@ -2,5 +2,6 @@ dropbox) name="Dropbox" type="dmg" downloadURL="https://www.dropbox.com/download?plat=mac&full=1" + appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | sed -E 's/.*%20([0-9.]*)\.dmg/\1/g') expectedTeamID="G7HH3F8CAK" ;; From d32c1bae9b9eecca11f0598abe5dfeca341b6316 Mon Sep 17 00:00:00 2001 From: DavidTaylor Date: Wed, 13 Apr 2022 16:24:16 -0700 Subject: [PATCH 31/91] Create slab.sh --- fragments/labels/slab.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 fragments/labels/slab.sh diff --git a/fragments/labels/slab.sh b/fragments/labels/slab.sh new file mode 100644 index 0000000..3a09f52 --- /dev/null +++ b/fragments/labels/slab.sh @@ -0,0 +1,12 @@ +slab) + name="Slab" + type="dmg" + if [[ $(arch) == i386 ]]; then + archiveName="Slab-[0-9.]*-darwin-x64.dmg" + elif [[ $(arch) == arm64 ]]; then + archiveName="Slab-[0-9.]*-darwin-arm64.dmg" + fi + downloadURL=$(downloadURLFromGit slab desktop-releases) + appNewVersion=$(versionFromGit slab desktop-releases) + expectedTeamID="Q67SW996Z5" + ;; \ No newline at end of file From a089d607ac7f429f2ef7a81f3e53575fe6b5163b Mon Sep 17 00:00:00 2001 From: jasmania2 <60817669+jasmania2@users.noreply.github.com> Date: Fri, 15 Apr 2022 14:23:14 -0400 Subject: [PATCH 32/91] New Label- SonoBus 2022-04-15 12:02:19 sonobus ################## Start Installomator v. 9.0dev 2022-04-15 12:02:19 sonobus ################## sonobus 2022-04-15 12:02:19 sonobus DEBUG mode 1 enabled. 2022-04-15 12:02:20 sonobus BLOCKING_PROCESS_ACTION=kill 2022-04-15 12:02:20 sonobus NOTIFY=all 2022-04-15 12:02:20 sonobus LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-04-15 12:02:20 sonobus no blocking processes defined, using Sonobus as default 2022-04-15 12:02:20 sonobus Changing directory to /Library/Application Support/JAMF/tmp 2022-04-15 12:02:20 sonobus App(s) found: /Applications/Sonobus.app 2022-04-15 12:02:20 sonobus found app at /Applications/Sonobus.app, version 1.5.1 2022-04-15 12:02:20 sonobus appversion: 1.5.1 2022-04-15 12:02:20 sonobus Latest version of Sonobus is 1.5.1 2022-04-15 12:02:20 sonobus DEBUG mode enabled, not exiting, but there is no new version of app. 2022-04-15 12:02:20 sonobus Downloading https://www.sonobus.net/releases/sonobus-1.5.1-mac.dmg to Sonobus.dmg 2022-04-15 12:02:20 sonobus notifying 2022-04-15 12:02:22 sonobus DEBUG mode, not checking for blocking processes 2022-04-15 12:02:22 sonobus Installing Sonobus 2022-04-15 12:02:22 sonobus notifying 2022-04-15 12:02:22 sonobus Mounting /Library/Application Support/JAMF/tmp/Sonobus.dmg 2022-04-15 12:02:23 sonobus Mounted: /Volumes/SonoBus v1.5.1 2022-04-15 12:02:23 sonobus found pkg: /Volumes/SonoBus v1.5.1/SonoBus Installer.pkg 2022-04-15 12:02:23 sonobus Verifying: /Volumes/SonoBus v1.5.1/SonoBus Installer.pkg 2022-04-15 12:02:24 sonobus Team ID: XCS435894D (expected: XCS435894D ) 2022-04-15 12:02:24 sonobus DEBUG enabled, skipping installation 2022-04-15 12:02:24 sonobus Finishing... 2022-04-15 12:02:34 sonobus App(s) found: /Applications/Sonobus.app 2022-04-15 12:02:34 sonobus found app at /Applications/Sonobus.app, version 1.5.1 2022-04-15 12:02:34 sonobus Installed Sonobus, version 1.5.1 2022-04-15 12:02:34 sonobus notifying 2022-04-15 12:02:34 sonobus Unmounting /Volumes/SonoBus v1.5.1 "disk2" ejected. 2022-04-15 12:02:34 sonobus DEBUG mode, not reopening anything 2022-04-15 12:02:34 sonobus ################## End Installomator, exit code 0 --- fragments/labels/sonobus.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 fragments/labels/sonobus.sh diff --git a/fragments/labels/sonobus.sh b/fragments/labels/sonobus.sh new file mode 100644 index 0000000..0aa9d9a --- /dev/null +++ b/fragments/labels/sonobus.sh @@ -0,0 +1,9 @@ +sonobus) +name="Sonobus" +type="pkgInDmg" +html_page_source="$(curl -fs 'https://www.sonobus.net')" +downloadFile="$(echo "${html_page_source}" | xmllint --html --xpath "string(//a[contains(@href, 'mac.dmg')]/@href)" - 2> /dev/null)" +downloadURL="https://www.sonobus.net/$downloadFile" +appNewVersion="$(echo "${downloadFile}" | sed 's/releases\/sonobus-//' | sed 's/\-mac.dmg//' )" +expectedTeamID="XCS435894D" +;; \ No newline at end of file From e74d0ab413ad7f8422292d03f7cbdddcdaa0c664 Mon Sep 17 00:00:00 2001 From: Ted Jangius Date: Thu, 21 Apr 2022 16:43:43 +0200 Subject: [PATCH 33/91] Fix for missing comment in header --- fragments/header.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fragments/header.sh b/fragments/header.sh index bde971b..9f4a7cc 100644 --- a/fragments/header.sh +++ b/fragments/header.sh @@ -238,7 +238,7 @@ IGNORE_DND_APPS="" # - updateToolArguments: # When Installomator detects an existing installation of the application, # and the updateTool variable is set -# $updateTool $updateArguments +# $updateTool $updateArguments # Will be run instead of of downloading and installing a complete new version. # Use this when the updateTool does differential and optimized downloads. # e.g. msupdate on various Microsoft labels @@ -253,7 +253,7 @@ IGNORE_DND_APPS="" # We need to define `name` for the installed app (to be version checked), as well as # `installerTool` for the installer app (if named differently than `name`. Installomator # will add the path to the folder/disk image with the binary, and it will be called like this: - `$CLIInstaller $CLIArguments` +# $CLIInstaller $CLIArguments # For most installations `CLIInstaller` should contain the `installerTool` for the CLI call # (if it’s the same). # We can support a whole range of other software titles by implementing this. From c6470fdd79520248bd2e715b7d4a5f04aa773e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 25 Apr 2022 09:02:27 +0200 Subject: [PATCH 34/91] duckduckgo web browser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s only in preview now, and you need an invitation code to run the app, but now we are ready for this. --- fragments/labels/duckduckgo.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fragments/labels/duckduckgo.sh diff --git a/fragments/labels/duckduckgo.sh b/fragments/labels/duckduckgo.sh new file mode 100644 index 0000000..bbac890 --- /dev/null +++ b/fragments/labels/duckduckgo.sh @@ -0,0 +1,8 @@ +duckduckgo) + name="DuckDuckGo" + type="dmg" + #downloadURL="https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo.dmg" + downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2) + appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2) + expectedTeamID="HKE973VLUW" + ;; From 24f99366cc9539202e6f6d9d825c87ca5fd76291 Mon Sep 17 00:00:00 2001 From: Ted Jangius Date: Mon, 25 Apr 2022 11:30:35 +0200 Subject: [PATCH 35/91] Code update and fix for firefox_intl Fixed $userLanguage to use dash separator instead of underscore, since that is what is used in the $releaseURL. --- fragments/labels/firefox_intl.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/fragments/labels/firefox_intl.sh b/fragments/labels/firefox_intl.sh index 0218c04..7737c6e 100644 --- a/fragments/labels/firefox_intl.sh +++ b/fragments/labels/firefox_intl.sh @@ -1,23 +1,25 @@ firefox_intl) - # This label will try to figure out the selected language of the user, + # 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" + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-') + printlog "Found language $userLanguage to be used for $name." + releaseURL="https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" + until curl -fs $releaseURL | grep -q "=$userLanguage"; do + if [ ${#userLanguage} -eq 2 ]; then + break fi + printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'" + userLanguage=${userLanguage:0:2} + done + printlog "Using language '$userLanguage' for download." + downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=$userLanguage" + if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then + printlog "Download not found for '$userLanguage', using default ('en-US')." + downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx" 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=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep ' Date: Mon, 25 Apr 2022 11:32:05 +0200 Subject: [PATCH 36/91] Code update and fix for firefoxesr_intl Fixed $userLanguage to use dash separator instead of underscore, since that is what is used in the $releaseURL. --- fragments/labels/firefoxesr_intl.sh | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/fragments/labels/firefoxesr_intl.sh b/fragments/labels/firefoxesr_intl.sh index 34f322c..5090292 100644 --- a/fragments/labels/firefoxesr_intl.sh +++ b/fragments/labels/firefoxesr_intl.sh @@ -1,24 +1,25 @@ firefoxesr_intl) - # This label will try to figure out the selected language of the user, + # This label will try to figure out the selected language of the user, # and install corrosponding version of Firefox ESR 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-esr/README.txt" | grep -o "=$userLanguage"; then - userLanguage=$(echo $userLanguage | cut -c 1-2) - if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep "=$userLanguage"; then - userLanguage="en_US" + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-') + printlog "Found language $userLanguage to be used for $name." + releaseURL="https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" + until curl -fs $releaseURL | grep -q "=$userLanguage"; do + if [ ${#userLanguage} -eq 2 ]; then + break fi - fi - printlog "Using language $userLanguage for download." + printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'" + userLanguage=${userLanguage:0:2} + done + printlog "Using language '$userLanguage' for download." downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage" - # https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US - 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" + if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then + printlog "Download not found for '$userLanguage', using default ('en-US')." + downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx" fi - appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*releases\/([0-9.]*)esr.*/\1/g') + appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"esr/"); print a[1]}') expectedTeamID="43AQ936H96" blockingProcesses=( firefox ) ;; From 522b0c5bf2f156b21fe1bc4f92e95ab3ed0a508f Mon Sep 17 00:00:00 2001 From: Ted Jangius Date: Mon, 25 Apr 2022 11:42:34 +0200 Subject: [PATCH 37/91] Added support for label thunderbird_intl Uses similar code as firefox_intl and firefoxesr_intl. --- fragments/labels/thunderbird_intl.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 fragments/labels/thunderbird_intl.sh diff --git a/fragments/labels/thunderbird_intl.sh b/fragments/labels/thunderbird_intl.sh new file mode 100644 index 0000000..cc3d759 --- /dev/null +++ b/fragments/labels/thunderbird_intl.sh @@ -0,0 +1,25 @@ +thunderbird_intl) + # This label will try to figure out the selected language of the user, + # and install corrosponding version of Thunderbird + name="Thunderbird" + type="dmg" + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-') + printlog "Found language $userLanguage to be used for $name." + releaseURL="https://ftp.mozilla.org/pub/thunderbird/releases/latest/README.txt" + until curl -fs $releaseURL | grep -q "=$userLanguage"; do + if [ ${#userLanguage} -eq 2 ]; then + break + fi + printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'" + userLanguage=${userLanguage:0:2} + done + printlog "Using language '$userLanguage' for download." + downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx&lang=$userLanguage" + if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then + printlog "Download not found for '$userLanguage', using default ('en-US')." + downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx" + fi + appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}') + expectedTeamID="43AQ936H96" + blockingProcesses=( thunderbird ) + ;; From 9407918bd770aff33a9ceada3f72da83aba3cc0c Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Tue, 26 Apr 2022 08:42:43 +0200 Subject: [PATCH 38/91] Update Snagit name Updated Snagit name to Snagit 2022 --- fragments/labels/snagit.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fragments/labels/snagit.sh b/fragments/labels/snagit.sh index 2c65478..8746839 100644 --- a/fragments/labels/snagit.sh +++ b/fragments/labels/snagit.sh @@ -1,7 +1,8 @@ snagit|\ +snagit2022|\ snagit2021|\ snagit2020) - name="Snagit 2021" + name="Snagit 2022" type="dmg" downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg" expectedTeamID="7TQL462TU8" From 1ce70bc8f346be757a23d0096dd14612507b3821 Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Tue, 26 Apr 2022 09:47:10 +0200 Subject: [PATCH 39/91] Update Snagit Added appNewVersion --- fragments/labels/snagit.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/fragments/labels/snagit.sh b/fragments/labels/snagit.sh index 8746839..adca81c 100644 --- a/fragments/labels/snagit.sh +++ b/fragments/labels/snagit.sh @@ -5,5 +5,6 @@ snagit2020) name="Snagit 2022" type="dmg" downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg" + appNewVersion=$( curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac)" | head -1 | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; From 026c399e0ccbad5e1946b9853ece025251862455 Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Tue, 26 Apr 2022 11:26:08 +0200 Subject: [PATCH 40/91] Update Camtasia to 2021 Fixed name and added appNewVersion --- fragments/labels/camtasia.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fragments/labels/camtasia.sh b/fragments/labels/camtasia.sh index 533a13e..ab3af66 100644 --- a/fragments/labels/camtasia.sh +++ b/fragments/labels/camtasia.sh @@ -1,6 +1,8 @@ -camtasia) - name="Camtasia 2020" +camtasia|\ +camtasia2021) + name="Camtasia 2021" type="dmg" downloadURL=https://download.techsmith.com/camtasiamac/releases/Camtasia.dmg + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac)" | head -1 | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; From 8d2d82df5ae56f96a825fd43ae9a179d70a318dd Mon Sep 17 00:00:00 2001 From: MacMike077 <104210875+MacMike077@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:13:41 +0200 Subject: [PATCH 41/91] Create NewLabel Flycut.sh 2022-04-26 15:12:45 : REQ : flycut : ################## Start Installomator v. 9.1, date 2022-03-18 2022-04-26 15:12:45 : INFO : flycut : ################## Version: 9.1 2022-04-26 15:12:45 : INFO : flycut : ################## Date: 2022-03-18 2022-04-26 15:12:45 : INFO : flycut : ################## flycut 2022-04-26 15:12:45 : INFO : flycut : BLOCKING_PROCESS_ACTION=tell_user 2022-04-26 15:12:45 : INFO : flycut : NOTIFY=success 2022-04-26 15:12:45 : INFO : flycut : LOGGING=INFO 2022-04-26 15:12:45 : INFO : flycut : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-04-26 15:12:45 : INFO : flycut : Label type: zip 2022-04-26 15:12:45 : INFO : flycut : archiveName: Flycut.[0-9.]*.zip 2022-04-26 15:12:45 : INFO : flycut : no blocking processes defined, using Flycut as default 2022-04-26 15:12:45 : INFO : flycut : name: Flycut, appName: Flycut.app 2022-04-26 15:12:46 : INFO : flycut : App(s) found: 2022-04-26 15:12:46 : WARN : flycut : could not find Flycut.app 2022-04-26 15:12:46 : INFO : flycut : appversion: 2022-04-26 15:12:46 : INFO : flycut : Latest version of Flycut is 1.9.6 2022-04-26 15:12:46 : REQ : flycut : Downloading https://github.com/TermiT/Flycut/releases/download/1.9.6/Flycut.1.9.6.zip to Flycut.[0-9.]*.zip 2022-04-26 15:12:47 : REQ : flycut : no more blocking processes, continue with update 2022-04-26 15:12:47 : REQ : flycut : Installing Flycut 2022-04-26 15:12:47 : INFO : flycut : Unzipping Flycut.[0-9.]*.zip 2022-04-26 15:12:47 : INFO : flycut : Verifying: /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.ScqcA2X3/Flycut.app 2022-04-26 15:12:48 : INFO : flycut : Team ID matching: S8JLSG5ES7 (expected: S8JLSG5ES7 ) 2022-04-26 15:12:48 : INFO : flycut : Installing Flycut version 1.9.6 on versionKey CFBundleShortVersionString. 2022-04-26 15:12:48 : INFO : flycut : App has LSMinimumSystemVersion: 10.10 2022-04-26 15:12:48 : INFO : flycut : Copy /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.ScqcA2X3/Flycut.app to /Applications 2022-04-26 15:12:48 : WARN : flycut : Changing owner to maikelwork 2022-04-26 15:12:48 : INFO : flycut : Finishing... 2022-04-26 15:12:58 : INFO : flycut : App(s) found: /Applications/Flycut.app 2022-04-26 15:12:58 : INFO : flycut : found app at /Applications/Flycut.app, version 1.9.6, on versionKey CFBundleShortVersionString 2022-04-26 15:12:58 : REQ : flycut : Installed Flycut, version 1.9.6 2022-04-26 15:12:58 : INFO : flycut : notifying 2022-04-26 15:12:58 : INFO : flycut : App not closed, so no reopen. 2022-04-26 15:12:58 : REQ : flycut : All done! 2022-04-26 15:12:58 : REQ : flycut : ################## End Installomator, exit code 0 --- fragments/labels/flycut.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fragments/labels/flycut.sh diff --git a/fragments/labels/flycut.sh b/fragments/labels/flycut.sh new file mode 100644 index 0000000..aafc603 --- /dev/null +++ b/fragments/labels/flycut.sh @@ -0,0 +1,8 @@ +flycut) + name="Flycut" + type="zip" + archiveName="Flycut.[0-9.]*.zip" + downloadURL="$(downloadURLFromGit TermiT Flycut)" + appNewVersion=$(versionFromGit TermiT Flycut ) + expectedTeamID="S8JLSG5ES7" +;; From 9307374775456587d4fe22fe448ab1931f77f6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 26 Apr 2022 21:40:23 +0200 Subject: [PATCH 42/91] mightymike now has now been signed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` ➜ Installomator/utils/assemble.sh mightymike DEBUG=0 2022-04-26 20:50:59 : WARN : mightymike : setting variable from argument DEBUG=0 2022-04-26 20:50:59 : REQ : mightymike : ################## Start Installomator v. 10dev, date 2022-04-26 2022-04-26 20:50:59 : INFO : mightymike : ################## Version: 10dev 2022-04-26 20:51:00 : INFO : mightymike : ################## Date: 2022-04-26 2022-04-26 20:51:00 : INFO : mightymike : ################## mightymike 2022-04-26 20:51:00 : INFO : mightymike : BLOCKING_PROCESS_ACTION=tell_user 2022-04-26 20:51:00 : INFO : mightymike : NOTIFY=success 2022-04-26 20:51:00 : INFO : mightymike : LOGGING=INFO 2022-04-26 20:51:00 : INFO : mightymike : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-04-26 20:51:00 : INFO : mightymike : Label type: dmg 2022-04-26 20:51:00 : INFO : mightymike : archiveName: Mighty Mike.dmg 2022-04-26 20:51:00 : INFO : mightymike : no blocking processes defined, using Mighty Mike as default 2022-04-26 20:51:00 : INFO : mightymike : name: Mighty Mike, appName: Mighty Mike.app 2022-04-26 20:51:00 : INFO : mightymike : App(s) found: 2022-04-26 20:51:00 : WARN : mightymike : could not find Mighty Mike.app 2022-04-26 20:51:00 : INFO : mightymike : appversion: 2022-04-26 20:51:00 : INFO : mightymike : Latest version of Mighty Mike is 3.0.1 2022-04-26 20:51:00 : REQ : mightymike : Downloading https://github.com/jorio/MightyMike/releases/download/v3.0.1/MightyMike-3.0.1-mac.dmg to Mighty Mike.dmg 2022-04-26 20:51:02 : REQ : mightymike : no more blocking processes, continue with update 2022-04-26 20:51:02 : REQ : mightymike : Installing Mighty Mike 2022-04-26 20:51:02 : INFO : mightymike : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.fKf0WTjS/Mighty Mike.dmg 2022-04-26 20:51:05 : INFO : mightymike : Mounted: /Volumes/Mighty Mike 3.0.1 2022-04-26 20:51:05 : INFO : mightymike : Verifying: /Volumes/Mighty Mike 3.0.1/Mighty Mike.app 2022-04-26 20:51:06 : INFO : mightymike : Team ID matching: RVNL7XC27G (expected: RVNL7XC27G ) 2022-04-26 20:51:06 : INFO : mightymike : Installing Mighty Mike version 3.0.1 on versionKey CFBundleShortVersionString. 2022-04-26 20:51:06 : INFO : mightymike : App has LSMinimumSystemVersion: 10.11 2022-04-26 20:51:06 : INFO : mightymike : Copy /Volumes/Mighty Mike 3.0.1/Mighty Mike.app to /Applications 2022-04-26 20:51:06 : WARN : mightymike : Changing owner to st 2022-04-26 20:51:06 : INFO : mightymike : Finishing... 2022-04-26 20:51:16 : INFO : mightymike : App(s) found: /Applications/Mighty Mike.app 2022-04-26 20:51:16 : INFO : mightymike : found app at /Applications/Mighty Mike.app, version 3.0.1, on versionKey CFBundleShortVersionString 2022-04-26 20:51:16 : REQ : mightymike : Installed Mighty Mike, version 3.0.1 2022-04-26 20:51:16 : INFO : mightymike : notifying 2022-04-26 20:51:16 : INFO : mightymike : App not closed, so no reopen. 2022-04-26 20:51:16 : REQ : mightymike : All done! 2022-04-26 20:51:16 : REQ : mightymike : ################## End Installomator, exit code 0 ``` --- fragments/{disabled => labels}/mightymike.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename fragments/{disabled => labels}/mightymike.sh (100%) diff --git a/fragments/disabled/mightymike.sh b/fragments/labels/mightymike.sh similarity index 100% rename from fragments/disabled/mightymike.sh rename to fragments/labels/mightymike.sh From 2589d2ec389189f2e55998b4606d6ea8fa90fe32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 26 Apr 2022 21:53:57 +0200 Subject: [PATCH 43/91] Update to duckduckgo as appcast was changed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The appcast url now has the newest version at the top. I guess we should sort the list if the newest will be moved again. Now this result: ``` ➜ Installomator/utils/assemble.sh duckduckgo DEBUG=0 2022-04-26 21:51:22 : WARN : duckduckgo : setting variable from argument DEBUG=0 2022-04-26 21:51:22 : REQ : duckduckgo : ################## Start Installomator v. 10dev, date 2022-04-26 2022-04-26 21:51:22 : INFO : duckduckgo : ################## Version: 10dev 2022-04-26 21:51:22 : INFO : duckduckgo : ################## Date: 2022-04-26 2022-04-26 21:51:22 : INFO : duckduckgo : ################## duckduckgo 2022-04-26 21:51:22 : INFO : duckduckgo : BLOCKING_PROCESS_ACTION=tell_user 2022-04-26 21:51:22 : INFO : duckduckgo : NOTIFY=success 2022-04-26 21:51:22 : INFO : duckduckgo : LOGGING=INFO 2022-04-26 21:51:22 : INFO : duckduckgo : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-04-26 21:51:22 : INFO : duckduckgo : Label type: dmg 2022-04-26 21:51:22 : INFO : duckduckgo : archiveName: DuckDuckGo.dmg 2022-04-26 21:51:22 : INFO : duckduckgo : no blocking processes defined, using DuckDuckGo as default 2022-04-26 21:51:22 : INFO : duckduckgo : App(s) found: /Applications/DuckDuckGo.app 2022-04-26 21:51:22 : INFO : duckduckgo : found app at /Applications/DuckDuckGo.app, version 0.22.3, on versionKey CFBundleShortVersionString 2022-04-26 21:51:22 : INFO : duckduckgo : appversion: 0.22.3 2022-04-26 21:51:22 : INFO : duckduckgo : Latest version of DuckDuckGo is 0.23.0 2022-04-26 21:51:22 : REQ : duckduckgo : Downloading https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo-0.23.0.dmg to DuckDuckGo.dmg 2022-04-26 21:51:24 : REQ : duckduckgo : no more blocking processes, continue with update 2022-04-26 21:51:24 : REQ : duckduckgo : Installing DuckDuckGo 2022-04-26 21:51:24 : INFO : duckduckgo : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.lQwUqkMi/DuckDuckGo.dmg 2022-04-26 21:51:28 : INFO : duckduckgo : Mounted: /Volumes/DuckDuckGo 2022-04-26 21:51:28 : INFO : duckduckgo : Verifying: /Volumes/DuckDuckGo/DuckDuckGo.app 2022-04-26 21:51:29 : INFO : duckduckgo : Team ID matching: HKE973VLUW (expected: HKE973VLUW ) 2022-04-26 21:51:29 : INFO : duckduckgo : Downloaded version of DuckDuckGo is 0.23.0 on versionKey CFBundleShortVersionString (replacing version 0.22.3). 2022-04-26 21:51:29 : INFO : duckduckgo : App has LSMinimumSystemVersion: 10.15 2022-04-26 21:51:29 : WARN : duckduckgo : Removing existing /Applications/DuckDuckGo.app 2022-04-26 21:51:29 : INFO : duckduckgo : Copy /Volumes/DuckDuckGo/DuckDuckGo.app to /Applications 2022-04-26 21:51:29 : WARN : duckduckgo : Changing owner to st 2022-04-26 21:51:29 : INFO : duckduckgo : Finishing... 2022-04-26 21:51:39 : INFO : duckduckgo : App(s) found: /Applications/DuckDuckGo.app 2022-04-26 21:51:39 : INFO : duckduckgo : found app at /Applications/DuckDuckGo.app, version 0.23.0, on versionKey CFBundleShortVersionString 2022-04-26 21:51:39 : REQ : duckduckgo : Installed DuckDuckGo, version 0.23.0 2022-04-26 21:51:39 : INFO : duckduckgo : notifying 2022-04-26 21:51:40 : INFO : duckduckgo : App not closed, so no reopen. 2022-04-26 21:51:40 : REQ : duckduckgo : All done! 2022-04-26 21:51:40 : REQ : duckduckgo : ################## End Installomator, exit code 0 ``` --- fragments/labels/duckduckgo.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fragments/labels/duckduckgo.sh b/fragments/labels/duckduckgo.sh index bbac890..a5cb4e0 100644 --- a/fragments/labels/duckduckgo.sh +++ b/fragments/labels/duckduckgo.sh @@ -2,7 +2,9 @@ duckduckgo) name="DuckDuckGo" type="dmg" #downloadURL="https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo.dmg" - downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2) - appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2) + #downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2) + downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2) + #appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2) + appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/sparkle:shortVersionString)[1]' 2>/dev/null | cut -d ">" -f2 | cut -d "<" -f1) expectedTeamID="HKE973VLUW" ;; From 7e6d394c686a22e76db3867d493e4629d1c651a3 Mon Sep 17 00:00:00 2001 From: Thomas Bartlett Date: Thu, 28 Apr 2022 11:58:15 -0400 Subject: [PATCH 44/91] Create macoslaps.sh --- fragments/labels/macoslaps.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fragments/labels/macoslaps.sh diff --git a/fragments/labels/macoslaps.sh b/fragments/labels/macoslaps.sh new file mode 100644 index 0000000..06b413c --- /dev/null +++ b/fragments/labels/macoslaps.sh @@ -0,0 +1,8 @@ +macoslaps) + name="macOSLAPS" + type="pkg" + packageID="edu.psu.macOSLAPS" + downloadURL="$(downloadURLFromGit joshua-d-miller macOSLAPS)" + appNewVersion="$(versionFromGit joshua-d-miller macOSLAPS)" + expectedTeamID="9UYK4F9BSM" + ;; From 4bfbe5e404254d5603c5114b617785ea3624d99c Mon Sep 17 00:00:00 2001 From: Patrick Veilleux Date: Thu, 28 Apr 2022 15:10:07 -0400 Subject: [PATCH 45/91] fix adobe acrobat reader DC download --- fragments/labels/adobereaderdc-update.sh | 2 +- fragments/labels/adobereaderdc.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fragments/labels/adobereaderdc-update.sh b/fragments/labels/adobereaderdc-update.sh index 026c6ab..a409cf5 100644 --- a/fragments/labels/adobereaderdc-update.sh +++ b/fragments/labels/adobereaderdc-update.sh @@ -1,7 +1,7 @@ adobereaderdc-update) name="Adobe Acrobat Reader DC" type="pkgInDmg" - downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo http://ardownload.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDCUpd"$adobecurrent"_MUI.dmg) + downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg) appNewVersion=$(curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt) #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" diff --git a/fragments/labels/adobereaderdc.sh b/fragments/labels/adobereaderdc.sh index 881e69a..48fd518 100644 --- a/fragments/labels/adobereaderdc.sh +++ b/fragments/labels/adobereaderdc.sh @@ -3,7 +3,8 @@ adobereaderdc-install) name="Adobe Acrobat Reader DC" type="pkgInDmg" packageID="com.adobe.acrobat.DC.reader.app.pkg.MUI" - downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\]",' | head -n 1 | cut -d \" -f 4) + #downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\]",' | head -n 1 | cut -d \" -f 4) + downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg) appNewVersion=$(curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt) #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" From e464efeb8256cde1b36ec410e51889bcbc35b716 Mon Sep 17 00:00:00 2001 From: Patrick Veilleux Date: Thu, 28 Apr 2022 15:11:33 -0400 Subject: [PATCH 46/91] Unnatural Scroll Wheels --- fragments/labels/unnaturalscrollwheels.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fragments/labels/unnaturalscrollwheels.sh diff --git a/fragments/labels/unnaturalscrollwheels.sh b/fragments/labels/unnaturalscrollwheels.sh new file mode 100644 index 0000000..18608ef --- /dev/null +++ b/fragments/labels/unnaturalscrollwheels.sh @@ -0,0 +1,8 @@ +unnaturalscrollwheels) + name="UnnaturalScrollWheels" + type="dmg" + downloadURL="$(downloadURLFromGit ther0n UnnaturalScrollWheels)" + appNewVersion="$(versionFromGit ther0n UnnaturalScrollWheels)" + expectedTeamID="D6H5W2T379" + blockingProcesses=( UnnaturalScrollWheels ) + ;; \ No newline at end of file From 5dc137dcbe5d2daf8abf2ee4d98e72d725a889ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Fri, 29 Apr 2022 13:44:41 +0200 Subject: [PATCH 47/91] Remote Desktop Manager changed domain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Result free version ``` ➜ Installomator/utils/assemble.sh remotedesktopmanagerfree DEBUG=0 Password: 2022-04-29 13:33:24 : WARN : remotedesktopmanagerfree : setting variable from argument DEBUG=0 2022-04-29 13:33:24 : REQ : remotedesktopmanagerfree : ################## Start Installomator v. 10dev, date 2022-04-29 2022-04-29 13:33:24 : INFO : remotedesktopmanagerfree : ################## Version: 10dev 2022-04-29 13:33:24 : INFO : remotedesktopmanagerfree : ################## Date: 2022-04-29 2022-04-29 13:33:24 : INFO : remotedesktopmanagerfree : ################## remotedesktopmanagerfree 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : BLOCKING_PROCESS_ACTION=tell_user 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : NOTIFY=success 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : LOGGING=INFO 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : Label type: dmg 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : archiveName: Remote Desktop Manager Free.dmg 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : no blocking processes defined, using Remote Desktop Manager Free as default 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : App(s) found: /Applications/Remote Desktop Manager Free.app 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : found app at /Applications/Remote Desktop Manager Free.app, version 2021.2.14.0, on versionKey CFBundleShortVersionString 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : appversion: 2021.2.14.0 2022-04-29 13:33:35 : INFO : remotedesktopmanagerfree : Latest version of Remote Desktop Manager Free is 2022.1.12.0 2022-04-29 13:33:35 : REQ : remotedesktopmanagerfree : Downloading https://cdn.devolutions.net/download/Mac/Devolutions.RemoteDesktopManager.Free.Mac.2022.1.12.0.dmg to Remote Desktop Manager Free.dmg 2022-04-29 13:34:05 : REQ : remotedesktopmanagerfree : no more blocking processes, continue with update 2022-04-29 13:34:05 : REQ : remotedesktopmanagerfree : Installing Remote Desktop Manager Free 2022-04-29 13:34:05 : INFO : remotedesktopmanagerfree : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.isdXwxzs/Remote Desktop Manager Free.dmg 2022-04-29 13:34:10 : INFO : remotedesktopmanagerfree : Mounted: /Volumes/Remote Desktop Manager Free.app Installer 2022-04-29 13:34:10 : INFO : remotedesktopmanagerfree : Verifying: /Volumes/Remote Desktop Manager Free.app Installer/Remote Desktop Manager Free.app 2022-04-29 13:34:21 : INFO : remotedesktopmanagerfree : Team ID matching: N592S9ASDB (expected: N592S9ASDB ) 2022-04-29 13:34:21 : INFO : remotedesktopmanagerfree : Downloaded version of Remote Desktop Manager Free is 2022.1.12.0 on versionKey CFBundleShortVersionString (replacing version 2021.2.14.0). 2022-04-29 13:34:21 : INFO : remotedesktopmanagerfree : App has LSMinimumSystemVersion: 10.10 2022-04-29 13:34:21 : WARN : remotedesktopmanagerfree : Removing existing /Applications/Remote Desktop Manager Free.app 2022-04-29 13:34:21 : INFO : remotedesktopmanagerfree : Copy /Volumes/Remote Desktop Manager Free.app Installer/Remote Desktop Manager Free.app to /Applications 2022-04-29 13:34:24 : WARN : remotedesktopmanagerfree : Changing owner to st 2022-04-29 13:34:24 : INFO : remotedesktopmanagerfree : Finishing... 2022-04-29 13:34:34 : INFO : remotedesktopmanagerfree : App(s) found: /Applications/Remote Desktop Manager Free.app 2022-04-29 13:34:34 : INFO : remotedesktopmanagerfree : found app at /Applications/Remote Desktop Manager Free.app, version 2022.1.12.0, on versionKey CFBundleShortVersionString 2022-04-29 13:34:34 : REQ : remotedesktopmanagerfree : Installed Remote Desktop Manager Free, version 2022.1.12.0 2022-04-29 13:34:34 : INFO : remotedesktopmanagerfree : notifying 2022-04-29 13:34:35 : INFO : remotedesktopmanagerfree : App not closed, so no reopen. 2022-04-29 13:34:35 : REQ : remotedesktopmanagerfree : All done! 2022-04-29 13:34:35 : REQ : remotedesktopmanagerfree : ################## End Installomator, exit code 0 ``` Enterprise version: ``` ➜ Installomator/utils/assemble.sh remotedesktopmanagerenterprise DEBUG=0 INSTALL=force 2022-04-29 13:35:51 : WARN : remotedesktopmanagerenterprise : setting variable from argument DEBUG=0 2022-04-29 13:35:51 : WARN : remotedesktopmanagerenterprise : setting variable from argument INSTALL=force 2022-04-29 13:35:51 : REQ : remotedesktopmanagerenterprise : ################## Start Installomator v. 10dev, date 2022-04-29 2022-04-29 13:35:51 : INFO : remotedesktopmanagerenterprise : ################## Version: 10dev 2022-04-29 13:35:51 : INFO : remotedesktopmanagerenterprise : ################## Date: 2022-04-29 2022-04-29 13:35:51 : INFO : remotedesktopmanagerenterprise : ################## remotedesktopmanagerenterprise 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : BLOCKING_PROCESS_ACTION=tell_user 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : NOTIFY=success 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : LOGGING=INFO 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : Label type: dmg 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : archiveName: Remote Desktop Manager.dmg 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : no blocking processes defined, using Remote Desktop Manager as default 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : name: Remote Desktop Manager, appName: Remote Desktop Manager.app 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : App(s) found: /Applications/Remote Desktop Manager Free.app 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : found app at /Applications/Remote Desktop Manager Free.app, version 2022.1.12.0, on versionKey CFBundleShortVersionString 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : appversion: 2022.1.12.0 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : Label is not of type “updateronly”, and it’s set to use force to install or ignoring app store apps, so not using updateTool. 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : Latest version of Remote Desktop Manager is 2022.1.12.0 2022-04-29 13:35:52 : INFO : remotedesktopmanagerenterprise : There is no newer version available. 2022-04-29 13:35:52 : REQ : remotedesktopmanagerenterprise : Downloading https://cdn.devolutions.net/download/Mac/Devolutions.RemoteDesktopManager.Mac.2022.1.12.0.dmg to Remote Desktop Manager.dmg 2022-04-29 13:36:24 : REQ : remotedesktopmanagerenterprise : no more blocking processes, continue with update 2022-04-29 13:36:24 : REQ : remotedesktopmanagerenterprise : Installing Remote Desktop Manager 2022-04-29 13:36:24 : INFO : remotedesktopmanagerenterprise : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.cOMzga0I/Remote Desktop Manager.dmg 2022-04-29 13:36:27 : INFO : remotedesktopmanagerenterprise : Mounted: /Volumes/Remote Desktop Manager.app Installer 2022-04-29 13:36:27 : INFO : remotedesktopmanagerenterprise : Verifying: /Volumes/Remote Desktop Manager.app Installer/Remote Desktop Manager.app 2022-04-29 13:36:32 : INFO : remotedesktopmanagerenterprise : Team ID matching: N592S9ASDB (expected: N592S9ASDB ) 2022-04-29 13:36:32 : INFO : remotedesktopmanagerenterprise : Downloaded version of Remote Desktop Manager is 2022.1.12.0 on versionKey CFBundleShortVersionString, same as installed. 2022-04-29 13:36:32 : INFO : remotedesktopmanagerenterprise : Using force to install anyway. 2022-04-29 13:36:32 : INFO : remotedesktopmanagerenterprise : App has LSMinimumSystemVersion: 10.10 2022-04-29 13:36:32 : INFO : remotedesktopmanagerenterprise : Copy /Volumes/Remote Desktop Manager.app Installer/Remote Desktop Manager.app to /Applications 2022-04-29 13:36:35 : WARN : remotedesktopmanagerenterprise : Changing owner to st 2022-04-29 13:36:35 : INFO : remotedesktopmanagerenterprise : Finishing... 2022-04-29 13:36:45 : INFO : remotedesktopmanagerenterprise : App(s) found: /Applications/Remote Desktop Manager.app 2022-04-29 13:36:45 : INFO : remotedesktopmanagerenterprise : found app at /Applications/Remote Desktop Manager.app, version 2022.1.12.0, on versionKey CFBundleShortVersionString 2022-04-29 13:36:45 : REQ : remotedesktopmanagerenterprise : Installed Remote Desktop Manager, version 2022.1.12.0 2022-04-29 13:36:45 : INFO : remotedesktopmanagerenterprise : notifying 2022-04-29 13:36:45 : INFO : remotedesktopmanagerenterprise : App not closed, so no reopen. 2022-04-29 13:36:45 : REQ : remotedesktopmanagerenterprise : All done! 2022-04-29 13:36:45 : REQ : remotedesktopmanagerenterprise : ################## End Installomator, exit code 0 ``` --- fragments/labels/remotedesktopmanagerenterprise.sh | 2 +- fragments/labels/remotedesktopmanagerfree.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fragments/labels/remotedesktopmanagerenterprise.sh b/fragments/labels/remotedesktopmanagerenterprise.sh index f058838..d247099 100644 --- a/fragments/labels/remotedesktopmanagerenterprise.sh +++ b/fragments/labels/remotedesktopmanagerenterprise.sh @@ -1,7 +1,7 @@ remotedesktopmanagerenterprise) name="Remote Desktop Manager" type="dmg" - downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1) + downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1) appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g') expectedTeamID="N592S9ASDB" ;; diff --git a/fragments/labels/remotedesktopmanagerfree.sh b/fragments/labels/remotedesktopmanagerfree.sh index 0d8dd95..60d8e5c 100644 --- a/fragments/labels/remotedesktopmanagerfree.sh +++ b/fragments/labels/remotedesktopmanagerfree.sh @@ -1,7 +1,7 @@ remotedesktopmanagerfree) name="Remote Desktop Manager Free" type="dmg" - downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1) + downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1) appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g') expectedTeamID="N592S9ASDB" ;; From 744ce4949d9eee7f570096ed66d1ebb8b2584dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Fri, 29 Apr 2022 14:31:10 +0200 Subject: [PATCH 48/91] Update remotedesktopmanagerenterprise.sh --- fragments/labels/remotedesktopmanagerenterprise.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/fragments/labels/remotedesktopmanagerenterprise.sh b/fragments/labels/remotedesktopmanagerenterprise.sh index d247099..4dd975d 100644 --- a/fragments/labels/remotedesktopmanagerenterprise.sh +++ b/fragments/labels/remotedesktopmanagerenterprise.sh @@ -4,4 +4,5 @@ remotedesktopmanagerenterprise) downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1) appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g') expectedTeamID="N592S9ASDB" + blockingProcesses=( "$name" ) ;; From 0266f74e46e8725e347813df54b54216787b7838 Mon Sep 17 00:00:00 2001 From: MacMike077 <104210875+MacMike077@users.noreply.github.com> Date: Mon, 2 May 2022 16:47:59 +0200 Subject: [PATCH 49/91] Create UltimakerCura.sh 2022-05-02 16:45:27 : REQ : ultimakercura : ################## Start Installomator v. 9.1, date 2022-03-18 2022-05-02 16:45:27 : INFO : ultimakercura : ################## Version: 9.1 2022-05-02 16:45:27 : INFO : ultimakercura : ################## Date: 2022-03-18 2022-05-02 16:45:27 : INFO : ultimakercura : ################## ultimakercura 2022-05-02 16:45:28 : INFO : ultimakercura : BLOCKING_PROCESS_ACTION=tell_user 2022-05-02 16:45:28 : INFO : ultimakercura : NOTIFY=success 2022-05-02 16:45:28 : INFO : ultimakercura : LOGGING=INFO 2022-05-02 16:45:28 : INFO : ultimakercura : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-02 16:45:28 : INFO : ultimakercura : Label type: dmg 2022-05-02 16:45:28 : INFO : ultimakercura : archiveName: Ultimaker_Cura-[0-9].*-Darwin.dmg 2022-05-02 16:45:28 : INFO : ultimakercura : no blocking processes defined, using Ultimaker Cura as default 2022-05-02 16:45:28 : INFO : ultimakercura : name: Ultimaker Cura, appName: Ultimaker Cura.app 2022-05-02 16:45:28 : INFO : ultimakercura : App(s) found: 2022-05-02 16:45:28 : WARN : ultimakercura : could not find Ultimaker Cura.app 2022-05-02 16:45:28 : INFO : ultimakercura : appversion: 2022-05-02 16:45:28 : INFO : ultimakercura : Latest version of Ultimaker Cura is 4.13.1 2022-05-02 16:45:28 : REQ : ultimakercura : Downloading https://github.com/Ultimaker/Cura/releases/download/4.13.1/Ultimaker_Cura-4.13.1-Darwin.dmg to Ultimaker_Cura-[0-9].*-Darwin.dmg 2022-05-02 16:45:34 : REQ : ultimakercura : no more blocking processes, continue with update 2022-05-02 16:45:34 : REQ : ultimakercura : Installing Ultimaker Cura 2022-05-02 16:45:34 : INFO : ultimakercura : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.WFz2hZIw/Ultimaker_Cura-[0-9].*-Darwin.dmg 2022-05-02 16:45:38 : INFO : ultimakercura : Mounted: /Volumes/Ultimaker_Cura-4.13.1-Darwin 2022-05-02 16:45:38 : INFO : ultimakercura : Verifying: /Volumes/Ultimaker_Cura-4.13.1-Darwin/Ultimaker Cura.app 2022-05-02 16:45:51 : INFO : ultimakercura : Team ID matching: V4B3JXRRQS (expected: V4B3JXRRQS ) 2022-05-02 16:45:51 : INFO : ultimakercura : Installing Ultimaker Cura version 4.13 on versionKey CFBundleShortVersionString. 2022-05-02 16:45:51 : INFO : ultimakercura : Copy /Volumes/Ultimaker_Cura-4.13.1-Darwin/Ultimaker Cura.app to /Applications 2022-05-02 16:46:04 : WARN : ultimakercura : No user logged in or SYSTEMOWNER=1, setting owner to root:wheel 2022-05-02 16:46:04 : INFO : ultimakercura : Finishing... 2022-05-02 16:46:14 : INFO : ultimakercura : App(s) found: /Applications/Ultimaker Cura.app 2022-05-02 16:46:14 : INFO : ultimakercura : found app at /Applications/Ultimaker Cura.app, version 4.13, on versionKey CFBundleShortVersionString 2022-05-02 16:46:14 : REQ : ultimakercura : Installed Ultimaker Cura, version 4.13 2022-05-02 16:46:14 : INFO : ultimakercura : notifying 2022-05-02 16:46:15 : INFO : ultimakercura : App not closed, so no reopen. 2022-05-02 16:46:15 : REQ : ultimakercura : All done! 2022-05-02 16:46:15 : REQ : ultimakercura : ################## End Installomator, exit code 0 --- fragments/labels/UltimakerCura.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fragments/labels/UltimakerCura.sh diff --git a/fragments/labels/UltimakerCura.sh b/fragments/labels/UltimakerCura.sh new file mode 100644 index 0000000..ec992ee --- /dev/null +++ b/fragments/labels/UltimakerCura.sh @@ -0,0 +1,8 @@ +ultimakercura) + name="Ultimaker Cura" + type="dmg" + downloadURL="$(downloadURLFromGit Ultimaker Cura)" + archiveName="Ultimaker_Cura-[0-9].*-Darwin.dmg" + appNewVersion=$(versionFromGit Ultimaker Cura ) + expectedTeamID="V4B3JXRRQS" + ;; From ed01f6d741b603fd440e9a88b759ed522f066aca Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Tue, 3 May 2022 15:51:45 +0200 Subject: [PATCH 50/91] Create new label iDrive --- fragments/labels/idrive.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 fragments/labels/idrive.sh diff --git a/fragments/labels/idrive.sh b/fragments/labels/idrive.sh new file mode 100644 index 0000000..6a16c03 --- /dev/null +++ b/fragments/labels/idrive.sh @@ -0,0 +1,9 @@ +idrive) + name="IDrive" + type="pkgInDmg" + pkgName="IDrive.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*href\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*mac_vernum=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; From f7d822a54efd9c3ed4386f10d026a29e105db90a Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Tue, 3 May 2022 16:11:19 +0200 Subject: [PATCH 51/91] Added separate Camtasia 2020 and 2019 labels --- fragments/labels/camtasia2019.sh | 7 +++++++ fragments/labels/camtasia2020.sh | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 fragments/labels/camtasia2019.sh create mode 100644 fragments/labels/camtasia2020.sh diff --git a/fragments/labels/camtasia2019.sh b/fragments/labels/camtasia2019.sh new file mode 100644 index 0000000..f8fefc1 --- /dev/null +++ b/fragments/labels/camtasia2019.sh @@ -0,0 +1,7 @@ +camtasia2019) + name="Camtasia 2019" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2019" | head -1 | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; \ No newline at end of file diff --git a/fragments/labels/camtasia2020.sh b/fragments/labels/camtasia2020.sh new file mode 100644 index 0000000..def99b3 --- /dev/null +++ b/fragments/labels/camtasia2020.sh @@ -0,0 +1,7 @@ +camtasia2020) + name="Camtasia 2020" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2020" | head -1 | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; \ No newline at end of file From 0141b8334e2559eee9cf41df66a3ac2f1e99f9f1 Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Tue, 3 May 2022 16:28:31 +0200 Subject: [PATCH 52/91] Create new label idrivethin --- .gitignore | 1 + Installomator.sh | 22 ++++++++++++++++++++-- fragments/labels/idrivethin.sh | 9 +++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 fragments/labels/idrivethin.sh diff --git a/.gitignore b/.gitignore index 4211055..88cfe0b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ scratch/ # do include Installomator .pkg files #!Installomator-*.pkg checkLabelCurrent.sh +Installomator.sh diff --git a/Installomator.sh b/Installomator.sh index 3f64473..2a4e1cc 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -302,8 +302,8 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then rosetta2=no fi fi -VERSION="9.1" -VERSIONDATE="2022-03-18" +VERSION="9.2beta" +VERSIONDATE="2022-05-03" # MARK: Functions @@ -2534,6 +2534,24 @@ icons) appNewVersion=$(versionFromGit sap macOS-icon-generator ) expectedTeamID="7R5ZEU67FQ" ;; +idrive) + name="IDrive" + type="pkgInDmg" + pkgName="IDrive.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*href\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*mac_vernum=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; +idrivethin) + name="IDrive" + type="pkgInDmg" + pkgName="IDriveThin.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; iina) name="IINA" type="dmg" diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh new file mode 100644 index 0000000..c4ff619 --- /dev/null +++ b/fragments/labels/idrivethin.sh @@ -0,0 +1,9 @@ +idrivethin) + name="IDrive" + type="pkgInDmg" + pkgName="IDriveThin.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; From f90c9c960a296d64148615588c372c4b80a2d39f Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Tue, 3 May 2022 16:30:07 +0200 Subject: [PATCH 53/91] Saparated Snagit installers by year --- fragments/labels/snagit.sh | 8 +++----- fragments/labels/snagit2019.sh | 7 +++++++ fragments/labels/snagit2020.sh | 7 +++++++ fragments/labels/snagit2021.sh | 7 +++++++ 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 fragments/labels/snagit2019.sh create mode 100644 fragments/labels/snagit2020.sh create mode 100644 fragments/labels/snagit2021.sh diff --git a/fragments/labels/snagit.sh b/fragments/labels/snagit.sh index adca81c..c8cb7fc 100644 --- a/fragments/labels/snagit.sh +++ b/fragments/labels/snagit.sh @@ -1,10 +1,8 @@ snagit|\ -snagit2022|\ -snagit2021|\ -snagit2020) +snagit2022) name="Snagit 2022" type="dmg" - downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg" - appNewVersion=$( curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac)" | head -1 | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2022" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2022" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; diff --git a/fragments/labels/snagit2019.sh b/fragments/labels/snagit2019.sh new file mode 100644 index 0000000..bff540c --- /dev/null +++ b/fragments/labels/snagit2019.sh @@ -0,0 +1,7 @@ +snagit2019) + name="Snagit 2019" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2019" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; \ No newline at end of file diff --git a/fragments/labels/snagit2020.sh b/fragments/labels/snagit2020.sh new file mode 100644 index 0000000..803ada8 --- /dev/null +++ b/fragments/labels/snagit2020.sh @@ -0,0 +1,7 @@ +snagit2020) + name="Snagit 2020" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2020" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; \ No newline at end of file diff --git a/fragments/labels/snagit2021.sh b/fragments/labels/snagit2021.sh new file mode 100644 index 0000000..5c8227e --- /dev/null +++ b/fragments/labels/snagit2021.sh @@ -0,0 +1,7 @@ +snagit2020) + name="Snagit 2021" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2021" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; \ No newline at end of file From 01d00aa361185f2bdf7c97a954bcbf61667f2e7e Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Tue, 3 May 2022 16:35:14 +0200 Subject: [PATCH 54/91] Revert "Create new label idrivethin" This reverts commit 0141b8334e2559eee9cf41df66a3ac2f1e99f9f1. --- .gitignore | 1 - Installomator.sh | 22 ++-------------------- fragments/labels/idrivethin.sh | 9 --------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 fragments/labels/idrivethin.sh diff --git a/.gitignore b/.gitignore index 88cfe0b..4211055 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ scratch/ # do include Installomator .pkg files #!Installomator-*.pkg checkLabelCurrent.sh -Installomator.sh diff --git a/Installomator.sh b/Installomator.sh index 2a4e1cc..3f64473 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -302,8 +302,8 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then rosetta2=no fi fi -VERSION="9.2beta" -VERSIONDATE="2022-05-03" +VERSION="9.1" +VERSIONDATE="2022-03-18" # MARK: Functions @@ -2534,24 +2534,6 @@ icons) appNewVersion=$(versionFromGit sap macOS-icon-generator ) expectedTeamID="7R5ZEU67FQ" ;; -idrive) - name="IDrive" - type="pkgInDmg" - pkgName="IDrive.pkg" - downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*href\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') - appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*mac_vernum=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') - versionKey="CFBundleVersion" - expectedTeamID="JWDCNYZ922" - ;; -idrivethin) - name="IDrive" - type="pkgInDmg" - pkgName="IDriveThin.pkg" - downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') - appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') - versionKey="CFBundleVersion" - expectedTeamID="JWDCNYZ922" - ;; iina) name="IINA" type="dmg" diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh deleted file mode 100644 index c4ff619..0000000 --- a/fragments/labels/idrivethin.sh +++ /dev/null @@ -1,9 +0,0 @@ -idrivethin) - name="IDrive" - type="pkgInDmg" - pkgName="IDriveThin.pkg" - downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') - appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') - versionKey="CFBundleVersion" - expectedTeamID="JWDCNYZ922" - ;; From ad1ddc22cd87b6a095451fb32f535eaa3add12ed Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Tue, 3 May 2022 16:37:06 +0200 Subject: [PATCH 55/91] Camtasia 2021 download URL improvement --- fragments/labels/camtasia.sh | 4 ++-- fragments/labels/camtasia2019.sh | 5 +++-- fragments/labels/camtasia2020.sh | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fragments/labels/camtasia.sh b/fragments/labels/camtasia.sh index ab3af66..559d772 100644 --- a/fragments/labels/camtasia.sh +++ b/fragments/labels/camtasia.sh @@ -2,7 +2,7 @@ camtasia|\ camtasia2021) name="Camtasia 2021" type="dmg" - downloadURL=https://download.techsmith.com/camtasiamac/releases/Camtasia.dmg - appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac)" | head -1 | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2021" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; diff --git a/fragments/labels/camtasia2019.sh b/fragments/labels/camtasia2019.sh index f8fefc1..170c056 100644 --- a/fragments/labels/camtasia2019.sh +++ b/fragments/labels/camtasia2019.sh @@ -2,6 +2,7 @@ camtasia2019) name="Camtasia 2019" type="dmg" downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) - appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2019" | head -1 | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2019" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" - ;; \ No newline at end of file + ;; + \ No newline at end of file diff --git a/fragments/labels/camtasia2020.sh b/fragments/labels/camtasia2020.sh index def99b3..9f2bea3 100644 --- a/fragments/labels/camtasia2020.sh +++ b/fragments/labels/camtasia2020.sh @@ -2,6 +2,7 @@ camtasia2020) name="Camtasia 2020" type="dmg" downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) - appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2020" | head -1 | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2020" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" - ;; \ No newline at end of file + ;; + \ No newline at end of file From 143967e29c77e48150b7061ebcdc59e15d74e005 Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Tue, 3 May 2022 16:38:21 +0200 Subject: [PATCH 56/91] New Line fix --- fragments/labels/snagit2019.sh | 3 ++- fragments/labels/snagit2020.sh | 3 ++- fragments/labels/snagit2021.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fragments/labels/snagit2019.sh b/fragments/labels/snagit2019.sh index bff540c..2133138 100644 --- a/fragments/labels/snagit2019.sh +++ b/fragments/labels/snagit2019.sh @@ -4,4 +4,5 @@ snagit2019) downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2019" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" - ;; \ No newline at end of file + ;; + \ No newline at end of file diff --git a/fragments/labels/snagit2020.sh b/fragments/labels/snagit2020.sh index 803ada8..eb03c39 100644 --- a/fragments/labels/snagit2020.sh +++ b/fragments/labels/snagit2020.sh @@ -4,4 +4,5 @@ snagit2020) downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2020" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" - ;; \ No newline at end of file + ;; + \ No newline at end of file diff --git a/fragments/labels/snagit2021.sh b/fragments/labels/snagit2021.sh index 5c8227e..85b9b24 100644 --- a/fragments/labels/snagit2021.sh +++ b/fragments/labels/snagit2021.sh @@ -4,4 +4,5 @@ snagit2020) downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2021" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" - ;; \ No newline at end of file + ;; + \ No newline at end of file From 8b5f5d40c9b1417aa2695a94f61d56b6d3304863 Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Tue, 3 May 2022 16:41:40 +0200 Subject: [PATCH 57/91] Create new label idrivethin --- fragments/labels/idrivethin.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 fragments/labels/idrivethin.sh diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh new file mode 100644 index 0000000..c4ff619 --- /dev/null +++ b/fragments/labels/idrivethin.sh @@ -0,0 +1,9 @@ +idrivethin) + name="IDrive" + type="pkgInDmg" + pkgName="IDriveThin.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; From dd50a618e933f8bd19d136299dedea9ca3184f42 Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Tue, 3 May 2022 16:42:02 +0200 Subject: [PATCH 58/91] Revert "Create new label idrivethin" This reverts commit 8b5f5d40c9b1417aa2695a94f61d56b6d3304863. --- fragments/labels/idrivethin.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 fragments/labels/idrivethin.sh diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh deleted file mode 100644 index c4ff619..0000000 --- a/fragments/labels/idrivethin.sh +++ /dev/null @@ -1,9 +0,0 @@ -idrivethin) - name="IDrive" - type="pkgInDmg" - pkgName="IDriveThin.pkg" - downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') - appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') - versionKey="CFBundleVersion" - expectedTeamID="JWDCNYZ922" - ;; From 78eec858097a9b54ad95e4162f380e845abfdd68 Mon Sep 17 00:00:00 2001 From: marcelpogorzelski <42753253+marcelpogorzelski@users.noreply.github.com> Date: Tue, 3 May 2022 16:42:24 +0200 Subject: [PATCH 59/91] Fixed appNewVersion Cut didn't work so I changed it to awk --- fragments/labels/citrixworkspace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/citrixworkspace.sh b/fragments/labels/citrixworkspace.sh index 1f11c5d..ea068d7 100644 --- a/fragments/labels/citrixworkspace.sh +++ b/fragments/labels/citrixworkspace.sh @@ -3,6 +3,6 @@ citrixworkspace) name="Citrix Workspace" type="pkgInDmg" downloadURL="https:"$(curl -s -L "https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html#ctx-dl-eula-external" | grep "dmg?" | sed "s/.*rel=.\(.*\)..id=.*/\1/") # http://downloads.citrix.com/18823/CitrixWorkspaceApp.dmg?__gda__=1605791892_edc6786a90eb5197fb226861a8e27aa8 - appNewVersion=$(curl -fs https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html | grep "

Version" | head -1 | cut -d " " -f1 | cut -d ";" -f2 | cut -d "." -f 1-3) + appNewVersion=$(curl -fs https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html | grep "

Version" | head -1 | awk '{print $2}' | cut -d "." -f 1-3) expectedTeamID="S272Y5R93J" ;; From 03f3e258e4a8bb9ac41f729c8937b08d950ef5b9 Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Tue, 3 May 2022 16:52:58 +0200 Subject: [PATCH 60/91] Create new label idrivethin --- fragments/labels/idrivethin.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 fragments/labels/idrivethin.sh diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh new file mode 100644 index 0000000..7b42d37 --- /dev/null +++ b/fragments/labels/idrivethin.sh @@ -0,0 +1,9 @@ +idrivethin) + name="IDrive" + type="pkgInDmg" + pkgName="IDriveThin.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; \ No newline at end of file From 3294751e63fed0c92d4aa208e0a2d54877563eb2 Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Tue, 3 May 2022 16:54:22 +0200 Subject: [PATCH 61/91] Revert "Create new label idrivethin" This reverts commit 03f3e258e4a8bb9ac41f729c8937b08d950ef5b9. --- fragments/labels/idrivethin.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 fragments/labels/idrivethin.sh diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh deleted file mode 100644 index 7b42d37..0000000 --- a/fragments/labels/idrivethin.sh +++ /dev/null @@ -1,9 +0,0 @@ -idrivethin) - name="IDrive" - type="pkgInDmg" - pkgName="IDriveThin.pkg" - downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') - appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') - versionKey="CFBundleVersion" - expectedTeamID="JWDCNYZ922" - ;; \ No newline at end of file From 589747f0ad482ac956920e3665bc89cae06c3d68 Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Tue, 3 May 2022 17:00:22 +0200 Subject: [PATCH 62/91] Create new label idrivethin --- fragments/labels/idrivethin.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 fragments/labels/idrivethin.sh diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh new file mode 100644 index 0000000..c4ff619 --- /dev/null +++ b/fragments/labels/idrivethin.sh @@ -0,0 +1,9 @@ +idrivethin) + name="IDrive" + type="pkgInDmg" + pkgName="IDriveThin.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; From 4d365aa9603f2236ba6c776192169fc0efcfac6b Mon Sep 17 00:00:00 2001 From: Fletcher Salesky Date: Tue, 3 May 2022 14:28:49 -0700 Subject: [PATCH 63/91] Create wechat.sh --- fragments/labels/wechat.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 fragments/labels/wechat.sh diff --git a/fragments/labels/wechat.sh b/fragments/labels/wechat.sh new file mode 100644 index 0000000..c03ca63 --- /dev/null +++ b/fragments/labels/wechat.sh @@ -0,0 +1,6 @@ +wechat) + name="WeChat" + type="dmg" + downloadURL="https://dldir1.qq.com/weixin/mac/WeChatMac.dmg" + expectedTeamID="5A4RE8SF68" + ;; From 66f32757414830d5385c74050d51f4db8b3ae470 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Wed, 4 May 2022 15:06:22 -0700 Subject: [PATCH 64/91] Add 1Password 8 --- Installomator.sh | 12 ++++++++++++ Labels.txt | 1 + 2 files changed, 13 insertions(+) diff --git a/Installomator.sh b/Installomator.sh index 3f64473..76f0cf2 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1302,6 +1302,18 @@ valuesfromarguments) blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" ) #forcefulQuit=YES ;; +1password8) + name="1Password 8" + type="zip" + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://downloads.1password.com/mac/1Password-latest-aarch64.zip" + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://downloads.1password.com/mac/1Password-latest-x86_64.zip" + fi + expectedTeamID="2BUA8C4S2C" + blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" ) + #forcefulQuit=YES + ;; 1passwordcli) name="1Password CLI" type="pkg" diff --git a/Labels.txt b/Labels.txt index dc91bee..2cf5ce1 100644 --- a/Labels.txt +++ b/Labels.txt @@ -1,4 +1,5 @@ 1password7 +1password8 1passwordcli 4kvideodownloader 8x8 From 13864a0cd7abaa23c1bd3999faeb5cf6c7cc69a5 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Wed, 4 May 2022 15:23:04 -0700 Subject: [PATCH 65/91] Add appName and archiveName for 1password8 --- Installomator.sh | 3 +++ fragments/labels/1password8.sh | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 fragments/labels/1password8.sh diff --git a/Installomator.sh b/Installomator.sh index 76f0cf2..5a72db6 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1304,10 +1304,13 @@ valuesfromarguments) ;; 1password8) name="1Password 8" + appName="1Password.app" type="zip" if [[ $(arch) == "arm64" ]]; then + archiveName="1Password-latest-aarch64.zip" downloadURL="https://downloads.1password.com/mac/1Password-latest-aarch64.zip" elif [[ $(arch) == "i386" ]]; then + archiveName="1Password-latest-x86_64.zip" downloadURL="https://downloads.1password.com/mac/1Password-latest-x86_64.zip" fi expectedTeamID="2BUA8C4S2C" diff --git a/fragments/labels/1password8.sh b/fragments/labels/1password8.sh new file mode 100644 index 0000000..8ca3e78 --- /dev/null +++ b/fragments/labels/1password8.sh @@ -0,0 +1,15 @@ +1password8) + name="1Password 8" + appName="1Password.app" + type="zip" + if [[ $(arch) == "arm64" ]]; then + archiveName="1Password-latest-aarch64.zip" + downloadURL="https://downloads.1password.com/mac/1Password-latest-aarch64.zip" + elif [[ $(arch) == "i386" ]]; then + archiveName="1Password-latest-x86_64.zip" + downloadURL="https://downloads.1password.com/mac/1Password-latest-x86_64.zip" + fi + expectedTeamID="2BUA8C4S2C" + blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" ) + #forcefulQuit=YES + ;; \ No newline at end of file From 259afeec3adc641f44ea121c432326ef83037c7a Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Thu, 5 May 2022 16:07:08 +0000 Subject: [PATCH 66/91] Update Grammarly Label --- fragments/labels/grammarly.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/fragments/labels/grammarly.sh b/fragments/labels/grammarly.sh index 5369199..4534682 100644 --- a/fragments/labels/grammarly.sh +++ b/fragments/labels/grammarly.sh @@ -1,9 +1,11 @@ grammarly) - name="Grammarly Desktop" - type="dmg" - packageID="com.grammarly.ProjectLlama" - downloadURL=$(curl -fsL "https://download-mac.grammarly.com/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2) - expectedTeamID="W8F64X92K3" - appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4) - appName="Grammarly Installer.app" - ;; + name="Grammarly Desktop" + type="dmg" + packageID="com.grammarly.ProjectLlama" + downloadURL=$(curl -fsL "https://download-mac.grammarly.com/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2) + expectedTeamID="W8F64X92K3" + appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4) + # appName="Grammarly Installer.app" + installerTool="Grammarly Installer.app" + CLIInstaller="Grammarly Installer.app/Contents/MacOS/Grammarly Desktop" +;; From 1571dec0145b803f6ec98b33739ee31be81b07b9 Mon Sep 17 00:00:00 2001 From: Greg R <60526422+imfromthebay@users.noreply.github.com> Date: Tue, 10 May 2022 13:55:56 -0700 Subject: [PATCH 67/91] New App: Linear (https://linear.app/) adding in a new app label for the Linear app. --- fragments/labels/linear.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 fragments/labels/linear.sh diff --git a/fragments/labels/linear.sh b/fragments/labels/linear.sh new file mode 100644 index 0000000..d44e238 --- /dev/null +++ b/fragments/labels/linear.sh @@ -0,0 +1,13 @@ +linear) + name="Linear" + type="dmg" + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://desktop.linear.app/mac/dmg/arm64" + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://desktop.linear.app/mac/dmg" + fi + appNewVersion=$(curl -sIkL $downloadURL | sed -r '/filename=/!d;s/.*filename=(.*)$/\1/' | awk '{print $2}') + expectedTeamID="7VZ2S3V9RV" + versionKey="CFBundleShortVersionString" + appName="Linear.app" + blockingProcesses=( "Linear" ) From 6bb5fedc21ad8dc02013dfdc44bf87fefa1b6ad0 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Thu, 12 May 2022 09:53:52 +0200 Subject: [PATCH 68/91] missing linebreak --- fragments/labels/drawio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/drawio.sh b/fragments/labels/drawio.sh index ee2994b..bd0241b 100644 --- a/fragments/labels/drawio.sh +++ b/fragments/labels/drawio.sh @@ -6,4 +6,4 @@ drawio) appNewVersion="$(versionFromGit jgraph drawio-desktop)" expectedTeamID="UZEUFB4N53" blockingProcesses=( draw.io ) - ;; \ No newline at end of file + ;; From 046df34e454fc7160d5573e711db2b926ff16609 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Thu, 12 May 2022 10:36:09 +0200 Subject: [PATCH 69/91] reset version.sh --- fragments/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/version.sh b/fragments/version.sh index 11d5a7f..c1d513b 100644 --- a/fragments/version.sh +++ b/fragments/version.sh @@ -1 +1 @@ -10dev +9.2beta From 4e31bd16a0f2dc212c2943fdf77d017342dfa8e9 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Thu, 12 May 2022 10:45:28 +0200 Subject: [PATCH 70/91] reset version.sh --- fragments/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/version.sh b/fragments/version.sh index 11d5a7f..c1d513b 100644 --- a/fragments/version.sh +++ b/fragments/version.sh @@ -1 +1 @@ -10dev +9.2beta From 47009577642757dd994debae824904beda4d577d Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Thu, 12 May 2022 13:55:55 +0200 Subject: [PATCH 71/91] added new label file for atextlegacy, see #464 --- fragments/labels/atextlegacy.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fragments/labels/atextlegacy.sh diff --git a/fragments/labels/atextlegacy.sh b/fragments/labels/atextlegacy.sh new file mode 100644 index 0000000..59ba49a --- /dev/null +++ b/fragments/labels/atextlegacy.sh @@ -0,0 +1,7 @@ +atextlegacy) + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="aText" + type="dmg" + downloadURL="https://trankynam.com/atext/downloads/aTextLegacy.dmg" + expectedTeamID="KHEMQ2FD9E" + ;; From 8d0f0379834b06cd6635a6b66398be05cdacd28a Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Thu, 12 May 2022 14:40:21 +0200 Subject: [PATCH 72/91] fixed label name for snagit2021 --- fragments/labels/snagit2021.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fragments/labels/snagit2021.sh b/fragments/labels/snagit2021.sh index 85b9b24..a5f3157 100644 --- a/fragments/labels/snagit2021.sh +++ b/fragments/labels/snagit2021.sh @@ -1,8 +1,7 @@ -snagit2020) +snagit2021) name="Snagit 2021" type="dmg" downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2021" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - \ No newline at end of file From 343785781a0264f74dbd351a4fb0c0c56a263317 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Thu, 12 May 2022 15:34:27 +0200 Subject: [PATCH 73/91] fixed line ending --- fragments/labels/slab.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/slab.sh b/fragments/labels/slab.sh index 3a09f52..708b453 100644 --- a/fragments/labels/slab.sh +++ b/fragments/labels/slab.sh @@ -9,4 +9,4 @@ slab) downloadURL=$(downloadURLFromGit slab desktop-releases) appNewVersion=$(versionFromGit slab desktop-releases) expectedTeamID="Q67SW996Z5" - ;; \ No newline at end of file + ;; From ab86ff3a45ecc56e6040d2cc0d746929ad22cb08 Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Thu, 12 May 2022 20:27:32 +0200 Subject: [PATCH 74/91] Create filezilla.sh Committing FileZilla install label. 2022-05-12 20:26:36 : REQ : filezilla : ################## Start Installomator v. 9.2beta, date 2022-05-12 2022-05-12 20:26:36 : INFO : filezilla : ################## Version: 9.2beta 2022-05-12 20:26:36 : INFO : filezilla : ################## Date: 2022-05-12 2022-05-12 20:26:36 : INFO : filezilla : ################## filezilla 2022-05-12 20:26:36 : DEBUG : filezilla : DEBUG mode 1 enabled. 2022-05-12 20:26:37 : INFO : filezilla : BLOCKING_PROCESS_ACTION=tell_user 2022-05-12 20:26:37 : INFO : filezilla : NOTIFY=success 2022-05-12 20:26:37 : INFO : filezilla : LOGGING=DEBUG 2022-05-12 20:26:37 : INFO : filezilla : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-12 20:26:37 : INFO : filezilla : Label type: tbz 2022-05-12 20:26:37 : INFO : filezilla : archiveName: FileZilla.tbz 2022-05-12 20:26:37 : DEBUG : filezilla : Changing directory to /Users/thijs/gits/Installomator/build 2022-05-12 20:26:37 : INFO : filezilla : No version found using packageID org.filezilla-project.filezilla 2022-05-12 20:26:37 : INFO : filezilla : App(s) found: /Applications/FileZilla.app 2022-05-12 20:26:37 : INFO : filezilla : found app at /Applications/FileZilla.app, version 3.59.0, on versionKey CFBundleShortVersionString 2022-05-12 20:26:37 : INFO : filezilla : appversion: 3.59.0 2022-05-12 20:26:37 : INFO : filezilla : Latest version of FileZilla is 3.59.0 2022-05-12 20:26:37 : WARN : filezilla : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-12 20:26:37 : REQ : filezilla : Downloading https://dl1.cdn.filezilla-project.org/client/FileZilla_3.59.0_macosx-x86.app.tar.bz2?h=EVqCnT_iz7cNzenu63lrtA&x=1652383597 to FileZilla.tbz 2022-05-12 20:26:39 : DEBUG : filezilla : File list: -rw-r--r-- 1 root staff 14M May 12 20:26 FileZilla.tbz 2022-05-12 20:26:39 : DEBUG : filezilla : File type: FileZilla.tbz: bzip2 compressed data, block size = 900k 2022-05-12 20:26:39 : DEBUG : filezilla : curl output was: * Trying 195.201.43.134:443... * Connected to dl1.cdn.filezilla-project.org (195.201.43.134) port 443 (#0) * ALPN, offering h2 * ALPN, offering http/1.1 * successfully set certificate verify locations: * CAfile: /etc/ssl/cert.pem * CApath: none * (304) (OUT), TLS handshake, Client hello (1): } [334 bytes data] * (304) (IN), TLS handshake, Server hello (2): { [122 bytes data] * (304) (IN), TLS handshake, Unknown (8): { [15 bytes data] * (304) (IN), TLS handshake, Certificate (11): { [4056 bytes data] * (304) (IN), TLS handshake, CERT verify (15): { [264 bytes data] * (304) (IN), TLS handshake, Finished (20): { [52 bytes data] * (304) (OUT), TLS handshake, Finished (20): } [52 bytes data] * SSL connection using TLSv1.3 / AEAD-AES256-GCM-SHA384 * ALPN, server accepted to use h2 * Server certificate: * subject: CN=dl1.cdn.filezilla-project.org * start date: Apr 27 04:25:27 2022 GMT * expire date: Jul 26 04:25:26 2022 GMT * subjectAltName: host "dl1.cdn.filezilla-project.org" matched cert's "dl1.cdn.filezilla-project.org" * issuer: C=US; O=Let's Encrypt; CN=R3 * SSL certificate verify ok. * Using HTTP2, server supports multiplexing * Connection state changed (HTTP/2 confirmed) * Copying HTTP/2 data in stream buffer to connection buffer after upgrade: len=0 * Using Stream ID: 1 (easy handle 0x7fd08180ca00) > GET /client/FileZilla_3.59.0_macosx-x86.app.tar.bz2?h=EVqCnT_iz7cNzenu63lrtA&x=1652383597 HTTP/2 > Host: dl1.cdn.filezilla-project.org > user-agent: curl/7.79.1 > accept: */* > * Connection state changed (MAX_CONCURRENT_STREAMS == 128)! < HTTP/2 200 < server: nginx < date: Thu, 12 May 2022 18:26:37 GMT < content-type: application/octet-stream < content-length: 14669261 < last-modified: Fri, 08 Apr 2022 14:36:35 GMT < etag: "62504873-dfd5cd" < x-robots-tag: noindex, nofollow < strict-transport-security: max-age=31536000; includeSubDomains; preload < accept-ranges: bytes < { [16160 bytes data] * Connection #0 to host dl1.cdn.filezilla-project.org left intact 2022-05-12 20:26:39 : REQ : filezilla : Installing FileZilla 2022-05-12 20:26:39 : INFO : filezilla : Unzipping FileZilla.tbz 2022-05-12 20:26:41 : INFO : filezilla : Verifying: /Users/thijs/gits/Installomator/build/FileZilla.app 2022-05-12 20:26:41 : DEBUG : filezilla : App size: 44M /Users/thijs/gits/Installomator/build/FileZilla.app 2022-05-12 20:26:42 : DEBUG : filezilla : Debugging enabled, App Verification output was: /Users/thijs/gits/Installomator/build/FileZilla.app: accepted source=Notarized Developer ID origin=Developer ID Application: Tim Kosse (5VPGKXL75N) 2022-05-12 20:26:42 : INFO : filezilla : Team ID matching: 5VPGKXL75N (expected: 5VPGKXL75N ) 2022-05-12 20:26:42 : INFO : filezilla : Downloaded version of FileZilla is 3.59.0 on versionKey CFBundleShortVersionString, same as installed. 2022-05-12 20:26:42 : DEBUG : filezilla : DEBUG mode 1, not reopening anything 2022-05-12 20:26:42 : REG : filezilla : No new version to install 2022-05-12 20:26:42 : REQ : filezilla : ################## End Installomator, exit code 0 --- fragments/labels/filezilla.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 fragments/labels/filezilla.sh diff --git a/fragments/labels/filezilla.sh b/fragments/labels/filezilla.sh new file mode 100755 index 0000000..858c794 --- /dev/null +++ b/fragments/labels/filezilla.sh @@ -0,0 +1,10 @@ +filezilla) + name="FileZilla" + type="tbz" + packageID="org.filezilla-project.filezilla" + downloadURL=$(curl -fs https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '"' '{print $2}' ) + appNewVersion=$( curl -fs https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '_' '{print $2}' ) + expectedTeamID="5VPGKXL75N" + blockingProcesses=( NONE ) + ;; + From 5eeabef0795f2867e4d2a6c7695574149c08f631 Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Thu, 12 May 2022 20:43:43 +0200 Subject: [PATCH 75/91] Create fontexplorer.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2022-05-12 20:40:36 : REQ : fontexplorer : ################## Start Installomator v. 9.2beta, date 2022-05-12 2022-05-12 20:40:36 : INFO : fontexplorer : ################## Version: 9.2beta 2022-05-12 20:40:36 : INFO : fontexplorer : ################## Date: 2022-05-12 2022-05-12 20:40:36 : INFO : fontexplorer : ################## fontexplorer 2022-05-12 20:40:36 : DEBUG : fontexplorer : DEBUG mode 1 enabled. 2022-05-12 20:40:36 : INFO : fontexplorer : BLOCKING_PROCESS_ACTION=tell_user 2022-05-12 20:40:36 : INFO : fontexplorer : NOTIFY=success 2022-05-12 20:40:36 : INFO : fontexplorer : LOGGING=DEBUG 2022-05-12 20:40:36 : INFO : fontexplorer : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-12 20:40:37 : INFO : fontexplorer : Label type: dmg 2022-05-12 20:40:37 : INFO : fontexplorer : archiveName: FontExplorer X Pro.dmg 2022-05-12 20:40:37 : INFO : fontexplorer : no blocking processes defined, using FontExplorer X Pro as default 2022-05-12 20:40:37 : DEBUG : fontexplorer : Changing directory to /Users/thijs/gits/Installomator/build 2022-05-12 20:40:37 : INFO : fontexplorer : No version found using packageID com.linotype.FontExplorerX 2022-05-12 20:40:37 : INFO : fontexplorer : App(s) found: /Applications/FontExplorer X Pro.app 2022-05-12 20:40:37 : INFO : fontexplorer : found app at /Applications/FontExplorer X Pro.app, version 7.3.0, on versionKey CFBundleShortVersionString 2022-05-12 20:40:37 : INFO : fontexplorer : appversion: 7.3.0 2022-05-12 20:40:37 : INFO : fontexplorer : Latest version of FontExplorer X Pro is 7.3.0 2022-05-12 20:40:37 : WARN : fontexplorer : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-12 20:40:37 : REQ : fontexplorer : Downloading http://www.fontexplorerx.com/download/free-trial/Mac/ to FontExplorer X Pro.dmg 2022-05-12 20:40:58 : DEBUG : fontexplorer : File list: -rw-r--r-- 1 root staff 219M May 12 20:40 FontExplorer X Pro.dmg 2022-05-12 20:40:58 : DEBUG : fontexplorer : File type: FontExplorer X Pro.dmg: bzip2 compressed data, block size = 100k 2022-05-12 20:40:58 : DEBUG : fontexplorer : curl output was: * Trying 104.18.180.24:80... * Connected to www.fontexplorerx.com (104.18.180.24) port 80 (#0) > GET /download/free-trial/Mac/ HTTP/1.1 > Host: www.fontexplorerx.com > User-Agent: curl/7.79.1 > Accept: */* > * Mark bundle as not supporting multiuse < HTTP/1.1 301 Moved Permanently < Date: Thu, 12 May 2022 18:40:37 GMT < Transfer-Encoding: chunked < Connection: keep-alive < Cache-Control: max-age=3600 < Expires: Thu, 12 May 2022 19:40:37 GMT < Location: https://www.fontexplorerx.com/download/free-trial/Mac/ < Set-Cookie: __cf_bm=kZPes1jyXmAENecQ_jHVQct9Dvv_ISHMkgRcS4glo0I-1652380837-0-AQPVHegSUW/AmyCHfCgPmZVwgpJlX+4Jhdd51CRneVeNlhg4cWjwzSZp1L+1T+G40HCB/aPfP1oHNCNBbcRLTS6YT7jub4dfXfD26HdNm7S8; path=/; expires=Thu, 12-May-22 19:10:37 GMT; domain=.fontexplorerx.com; HttpOnly; SameSite=None < Server: cloudflare < CF-RAY: 70a548a99c75972d-AMS < * Ignoring the response-body { [5 bytes data] * Connection #0 to host www.fontexplorerx.com left intact * Issue another request to this URL: 'https://www.fontexplorerx.com/download/free-trial/Mac/' * Trying 104.18.180.24:443... * Connected to www.fontexplorerx.com (104.18.180.24) port 443 (#1) * ALPN, offering h2 * ALPN, offering http/1.1 * successfully set certificate verify locations: * CAfile: /etc/ssl/cert.pem * CApath: none * (304) (OUT), TLS handshake, Client hello (1): } [326 bytes data] * (304) (IN), TLS handshake, Server hello (2): { [122 bytes data] * (304) (IN), TLS handshake, Unknown (8): { [19 bytes data] * (304) (IN), TLS handshake, Certificate (11): { [2992 bytes data] * (304) (IN), TLS handshake, CERT verify (15): { [264 bytes data] * (304) (IN), TLS handshake, Finished (20): { [52 bytes data] * (304) (OUT), TLS handshake, Finished (20): } [52 bytes data] * SSL connection using TLSv1.3 / AEAD-AES256-GCM-SHA384 * ALPN, server accepted to use h2 * Server certificate: * subject: C=US; ST=Massachusetts; L=Woburn; O=Monotype Imaging Inc.; CN=*.fontexplorerx.com * start date: Oct 7 00:00:00 2021 GMT * expire date: Nov 7 23:59:59 2022 GMT * subjectAltName: host "www.fontexplorerx.com" matched cert's "*.fontexplorerx.com" * issuer: C=US; O=DigiCert Inc; CN=DigiCert TLS RSA SHA256 2020 CA1 * SSL certificate verify ok. * Using HTTP2, server supports multiplexing * Connection state changed (HTTP/2 confirmed) * Copying HTTP/2 data in stream buffer to connection buffer after upgrade: len=0 * Using Stream ID: 1 (easy handle 0x7fc1df00d200) > GET /download/free-trial/Mac/ HTTP/2 > Host: www.fontexplorerx.com > user-agent: curl/7.79.1 > accept: */* > * Connection state changed (MAX_CONCURRENT_STREAMS == 256)! < HTTP/2 302 < date: Thu, 12 May 2022 18:40:37 GMT < content-type: text/html; charset=utf-8 < location: https://fex.linotype.com/download/mac/FontExplorerXPro.dmg < cache-control: no-cache, no-store, must-revalidate < pragma: no-cache < expires: -1 < x-content-type-options: nosniff < content-security-policy: frame-ancestors 'none' < strict-transport-security: max-age=31536002 < cf-cache-status: DYNAMIC < expect-ct: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct" < set-cookie: __cf_bm=dYYK6Y7iXYOgbnA4M2wcaGi_3TSiOjfbcxSSw3Zbino-1652380837-0-AVfDaWLwFR6cAPkneaotOxDc7uxHiUEPuV92v30LSBVarfBz2BmbAgyBtIlmQBVorqV7i4ihmfqfHx+toFnCJJTxa6tymS6p9Cg6cp6Gs6hU; path=/; expires=Thu, 12-May-22 19:10:37 GMT; domain=.fontexplorerx.com; HttpOnly; Secure; SameSite=None < server: cloudflare < cf-ray: 70a548aa1d8e0b43-AMS < * Ignoring the response-body { [175 bytes data] * Connection #1 to host www.fontexplorerx.com left intact * Issue another request to this URL: 'https://fex.linotype.com/download/mac/FontExplorerXPro.dmg' * Trying 104.16.65.114:443... * Connected to fex.linotype.com (104.16.65.114) port 443 (#2) * ALPN, offering h2 * ALPN, offering http/1.1 * successfully set certificate verify locations: * CAfile: /etc/ssl/cert.pem * CApath: none * (304) (OUT), TLS handshake, Client hello (1): } [321 bytes data] * (304) (IN), TLS handshake, Server hello (2): { [122 bytes data] * (304) (IN), TLS handshake, Unknown (8): { [19 bytes data] * (304) (IN), TLS handshake, Certificate (11): { [2979 bytes data] * (304) (IN), TLS handshake, CERT verify (15): { [264 bytes data] * (304) (IN), TLS handshake, Finished (20): { [52 bytes data] * (304) (OUT), TLS handshake, Finished (20): } [52 bytes data] * SSL connection using TLSv1.3 / AEAD-AES256-GCM-SHA384 * ALPN, server accepted to use h2 * Server certificate: * subject: C=US; ST=Massachusetts; L=Woburn; O=Monotype Imaging Inc.; CN=*.linotype.com * start date: Oct 19 00:00:00 2021 GMT * expire date: Nov 19 23:59:59 2022 GMT * subjectAltName: host "fex.linotype.com" matched cert's "*.linotype.com" * issuer: C=US; O=DigiCert Inc; CN=DigiCert TLS RSA SHA256 2020 CA1 * SSL certificate verify ok. * Using HTTP2, server supports multiplexing * Connection state changed (HTTP/2 confirmed) * Copying HTTP/2 data in stream buffer to connection buffer after upgrade: len=0 * Using Stream ID: 1 (easy handle 0x7fc1df00d200) > GET /download/mac/FontExplorerXPro.dmg HTTP/2 > Host: fex.linotype.com > user-agent: curl/7.79.1 > accept: */* > * Connection state changed (MAX_CONCURRENT_STREAMS == 256)! < HTTP/2 301 < date: Thu, 12 May 2022 18:40:37 GMT < content-type: text/html; charset=iso-8859-1 < location: https://fex.linotype.com/download/mac/FontExplorerXPro730.dmg < x-content-type-options: nosniff < strict-transport-security: max-age=600 < cf-cache-status: HIT < age: 434 < expires: Thu, 12 May 2022 22:40:37 GMT < cache-control: public, max-age=14400 < expect-ct: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct" < set-cookie: __cf_bm=SlfrZLCGpjb6KyGZO8AA0rwgarMWV7kPmFXBLTzy5W4-1652380837-0-AbVvJxFnFOqL80rmdoW6+BJoGPtsSkZracJNOqpaUuwfkPqWxPXamLI3d94NaQ7loSyoYWq7sQEi2MBI2EVzhlg=; path=/; expires=Thu, 12-May-22 19:10:37 GMT; domain=.linotype.com; HttpOnly; Secure; SameSite=None < server: cloudflare < cf-ray: 70a548acfe324c61-AMS < * Ignoring the response-body { [269 bytes data] * Connection #2 to host fex.linotype.com left intact * Issue another request to this URL: 'https://fex.linotype.com/download/mac/FontExplorerXPro730.dmg' * Found bundle for host fex.linotype.com: 0x600000236f70 [can multiplex] * Re-using existing connection! (#2) with host fex.linotype.com * Connected to fex.linotype.com (104.16.65.114) port 443 (#2) * Using Stream ID: 3 (easy handle 0x7fc1df00d200) > GET /download/mac/FontExplorerXPro730.dmg HTTP/2 > Host: fex.linotype.com > user-agent: curl/7.79.1 > accept: */* > < HTTP/2 301 < date: Thu, 12 May 2022 18:40:37 GMT < content-type: text/html; charset=iso-8859-1 < location: https://fast.fontexplorerx.com/FontExplorerXPro730.dmg < x-content-type-options: nosniff < strict-transport-security: max-age=600 < cf-cache-status: HIT < age: 433 < expires: Thu, 12 May 2022 22:40:37 GMT < cache-control: public, max-age=14400 < expect-ct: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct" < set-cookie: __cf_bm=Q4TbFu6Pl0l_HkUJCmCaf5rQaPllv5YED.XM2SL79U8-1652380837-0-AW4DU7pcHEiy+fHl61+ok4XgWh0nEcH+xQmqFXKJiv7H+3qCrGMgF3VX72WPtXrPszVJXl5V0uRNL2er8uChQpk=; path=/; expires=Thu, 12-May-22 19:10:37 GMT; domain=.linotype.com; HttpOnly; Secure; SameSite=None < server: cloudflare < cf-ray: 70a548ad2e6d4c61-AMS < * Ignoring the response-body { [262 bytes data] * Connection #2 to host fex.linotype.com left intact * Issue another request to this URL: 'https://fast.fontexplorerx.com/FontExplorerXPro730.dmg' * Trying 104.18.181.24:443... * Connected to fast.fontexplorerx.com (104.18.181.24) port 443 (#3) * ALPN, offering h2 * ALPN, offering http/1.1 * successfully set certificate verify locations: * CAfile: /etc/ssl/cert.pem * CApath: none * (304) (OUT), TLS handshake, Client hello (1): } [327 bytes data] * (304) (IN), TLS handshake, Server hello (2): { [122 bytes data] * (304) (IN), TLS handshake, Unknown (8): { [19 bytes data] * (304) (IN), TLS handshake, Certificate (11): { [2992 bytes data] * (304) (IN), TLS handshake, CERT verify (15): { [264 bytes data] * (304) (IN), TLS handshake, Finished (20): { [52 bytes data] * (304) (OUT), TLS handshake, Finished (20): } [52 bytes data] * SSL connection using TLSv1.3 / AEAD-AES256-GCM-SHA384 * ALPN, server accepted to use h2 * Server certificate: * subject: C=US; ST=Massachusetts; L=Woburn; O=Monotype Imaging Inc.; CN=*.fontexplorerx.com * start date: Oct 7 00:00:00 2021 GMT * expire date: Nov 7 23:59:59 2022 GMT * subjectAltName: host "fast.fontexplorerx.com" matched cert's "*.fontexplorerx.com" * issuer: C=US; O=DigiCert Inc; CN=DigiCert TLS RSA SHA256 2020 CA1 * SSL certificate verify ok. * Using HTTP2, server supports multiplexing * Connection state changed (HTTP/2 confirmed) * Copying HTTP/2 data in stream buffer to connection buffer after upgrade: len=0 * Using Stream ID: 1 (easy handle 0x7fc1df00d200) > GET /FontExplorerXPro730.dmg HTTP/2 > Host: fast.fontexplorerx.com > user-agent: curl/7.79.1 > accept: */* > * Connection state changed (MAX_CONCURRENT_STREAMS == 256)! < HTTP/2 200 < date: Thu, 12 May 2022 18:40:38 GMT < content-type: application/x-apple-diskimage < content-length: 229482072 < x-amz-id-2: rrcC6JFnkN2jtYk94tMm+523tEdrKttw5CAFgpRxGam9Q+CbHoM/Uh574h1Tiej44o+/Y/NwdLY= < x-amz-request-id: CB8VSYEZ9B03GME4 < last-modified: Wed, 02 Mar 2022 10:13:51 GMT < etag: "1e88553987c85a58640ed89b09b3905a-14" < x-amz-version-id: cnP65ReMq6hht_tJxn6vOaTLvOrEPBC8 < cf-cache-status: HIT < age: 434 < expires: Thu, 12 May 2022 22:40:38 GMT < cache-control: public, max-age=14400 < accept-ranges: bytes < expect-ct: max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct" < set-cookie: __cf_bm=fXzImTkInEiKHLNXQKjb4ssMB7TRhWIvw3OZqbnDGYA-1652380838-0-AVO+uwdFQxX4T6ttCaCyQ0IvfqwyaOvkySC4KiaQDqZv7Z9xZDH9qDg1jUHyTJNVdZEnTT1Z7YH3I3xRC4NWKJOHeHnD3lmDBXorIH2I7uRv; path=/; expires=Thu, 12-May-22 19:10:38 GMT; domain=.fontexplorerx.com; HttpOnly; Secure; SameSite=None < server: cloudflare < cf-ray: 70a548ad99424bef-AMS < { [701 bytes data] * Connection #3 to host fast.fontexplorerx.com left intact 2022-05-12 20:40:58 : DEBUG : fontexplorer : DEBUG mode 1, not checking for blocking processes 2022-05-12 20:40:58 : REQ : fontexplorer : Installing FontExplorer X Pro 2022-05-12 20:40:59 : INFO : fontexplorer : Mounting /Users/thijs/gits/Installomator/build/FontExplorer X Pro.dmg 2022-05-12 20:41:20 : DEBUG : fontexplorer : Debugging enabled, dmgmount output was: FontExplorer X Software License Agreement We recommend that you print this Agreement for further reference. This FontExplorer X Software License Agreement (this “Agreement”) becomes a binding contract between you and Monotype, when you click on the area marked “ACCEPT LICENSE AGREEMENT” (or such similar language). If you do not wish to be bound by this Agreement, you may not Use the FontExplorer X Software. Please read all of this Agreement before you agree to be bound by its terms and conditions. 1. Definitions Defined terms used throughout this Agreement: “Critical Patch Releases” means updates to the FontExplorer X Software that Monotype determines, in its sole discretion, will be made available on a general basis to all of its customers. Critical Patch Releases may or may not include certain changes that are included in an Update and may be released before or after any such Update is provided to eligible customers. A Critical Patch Release may, in Monotype’s sole discretion, be released prior to completion of Monotype’s complete quality assurance testing process. “Device” means any piece of electronic equipment or mechanism designed to serve a special purpose or perform a special function, including, but not limited to, a desktop computer, server or laptop. “FontExplorer X Pro Software” means all the contents of the files, CD-ROM, DVD-ROM or other media relating to Monotype’s proprietary FontExplorer X Pro Software product if such product is provided to you under this Agreement. The FontExplorer X Pro Software may include Plugins delivered as part of the FontExplorer X Pro Software package, Updates, Upgrades, Critical Patch Releases, permitted copies, and related documentation, in each case which may be provided to you by Monotype in its sole discretion. “FontExplorer X Server Software” means all the contents of the files, CD-ROM, DVD-ROM or other media relating to Monotype’s proprietary FontExplorer X Server Software product if such product is provided to you under this Agreement. The FontExplorer X Server Software may include Updates, Upgrades, Critical Patch Releases, permitted copies, and related documentation, in each case which may be provided to you by Monotype in its sole discretion. “FontExplorer X Software” means the FontExplorer X Pro Software or the FontExplorer X Thin Client Software and, as the case may be, the FontExplorer X Server Software. “FontExplorer X Thin Client Software” means the all contents of the files, CD-ROM, DVD-ROM or other media relating to Monotype’s proprietary FontExplorer X Thin Client Software product if such product is provided to you under this Agreement. The FontExplorer X Thin Client Software may include Plugins delivered as part of the FontExplorer X Thin Client Software package, Updates, Upgrades, Critical Patch Releases, permitted copies, and related documentation, in each case which may be provided to you by Monotype in its sole discretion. “Licensed Server” means a Device that the FontExplorer X Server Software runs on, regardless of other purposes the Device may be used for, and which shall remain in your sole care, custody and control (or, if the Licensed Server is hosted by an internet service provider for your benefit, you shall be responsible for all content on the Licensed Server, as well as access to and security for such content). “Licensed User” means you and, so long as they have been notified by you of the terms and conditions of this Agreement and have agreed to be bound by it, (i) if you are an individual, members of your immediate household or (ii) if you are a business entity, your employees and any contractors, in each case subject to the limit of the number of users specified in the respective invoice(s) or licensing document(s). “Monotype” means collectively Monotype Imaging Inc., 600 Unicorn Park Drive, Woburn, Massachusetts 01801, USA, its successors and assigns, its parent and affiliated corporations, its authorized distributors, and any third party which has licensed to Monotype any or all of the components of the FontExplorer X Software supplied to you pursuant to this Agreement. “Software Releases” are newly named products which provide unique functionality beyond the scope of previously released software products and which will be made available to customers for an additional fee. “Trial Period” is a period defined by the communication between you and Monotype to evaluate FontExplorer X Software in accordance with the terms of this Agreement. “Update” means any bug fixes or minor debugging that revises or corrects inefficiencies or defects in the FontExplorer X Software. Some specific updates may include a Critical Patch Release in Monotype’s sole discretion. Updates shall not include any Upgrades or Software Releases. “Upgrade” means a new version of the FontExplorer X Software which provides product updates, feature enhancements and/or the foundation for additional functionality beyond that contained in the most recent version of the FontExplorer X Software. Upgrades shall not include any Software Releases. “Use” of the FontExplorer X Software shall occur when it is downloaded, installed, executed, accessed or an individual or entity otherwise benefits from the FontExplorer X Software. 2. Scope You are bound by this Agreement and you acknowledge that all Use of the FontExplorer X Software is governed by this Agreement. You are responsible for any breach of this Agreement by a Licensed User. 3. License Grants 3.1 FontExplorer X Server Software. If the quotation appertaining to this Agreement references the FontExplorer X Server Software you are hereby granted, unless you obtain the FontExplorer X Server Software for a Trial Period, subject to the payment of the applicable license fees, and subject to the terms and conditions of this Agreement, a non-exclusive, non-assignable, non-transferable (if the FontExplorer X Software was not acquired through a subscription except as expressly permitted in Section 9 of this Agreement) license to (i) Use the FontExplorer X Server Software on Licensed Servers and (ii) to permit Licensed Users to access and Use the FontExplorer X Server Software through Devices or through an internal local area network (LAN) which includes connections though a Virtual Private Network (VPN). 3.2 FontExplorer X Pro Software or FontExplorer X Thin Client Software. Subject to the payment of the applicable license fees, and subject to the terms and conditions of this Agreement, each Licensed User is hereby granted a non-exclusive, non-assignable, non-transferable (if the FontExplorer X Software or the FontExplorer X Thin Client Software was not acquired through a subscription except as expressly permitted in Section 9 of this Agreement) license to copy and Use the FontExplorer X Pro Software or FontExplorer X Thin Client Software on Devices which a Licensed User may access under the condition that persons other than Licensed Users are excluded from Use of the FontExplorer X Pro Software or FontExplorer X Thin Client Software. The FontExplorer X Pro Software or FontExplorer X Thin Client Software may be Used from a server (through a LAN or external network system) as long as such Use is restricted to Licensed Users. 4. Copies and Modifications 4.1 FontExplorer X Server Software. If the quotation appertaining to this Agreement references the FontExplorer X Server Software you may make one back-up copy of the FontExplorer X Server Software for archival purposes only, and you shall retain exclusive custody and control over such copy. Such copy must contain the same copyright, trademark, and other proprietary notices that appear on or in the FontExplorer X Server Software. 4.2 FontExplorer X Pro Software or FontExplorer X Thin Client Software. With the exception of making copies of the FontExplorer X Pro Software or FontExplorer X Thin Client Software for Devices which a Licensed User may access as provided by 3.2, a Licensed User may make one back-up copy of the FontExplorer X Pro Software or FontExplorer X Thin Client Software for archival purposes only, and such Licensed User shall retain exclusive custody and control over such copy. Such copy must contain the same copyright, trademark, and other proprietary notices that appear on or in the FontExplorer X Pro Software or FontExplorer X Thin Client Software. 4.3 Additional Restrictions. You may not, and you will not encourage, assist or authorize any other person to: ¥ Install the FontExplorer X Server Software on Devices other than on a Licensed Server; ¥ Use the FontExplorer X Software if such person is not a Licensed User; ¥ sublicense, rent or lease, adapt, modify, alter, translate, convert, create any derivative work or otherwise change the FontExplorer X Software or any portion thereof; or ¥ reverse engineer, decompile, disassemble, or otherwise attempt to discover the source code of the FontExplorer X Software or any portion thereof, provided, however, that if you are located in a European Community member country or any other country which provides rights materially similar to the rights set forth in this proviso, you may reverse engineer or decompile the FontExplorer X Software only to the extent that sufficient information is not available for the purpose of creating an interoperable software program (but only for such purpose and only to the extent that sufficient information is not provided by Monotype upon written request). You agree not to publish, or make otherwise accessible to the public, the information arrived at through reverse engineering and/or decompiling for the purpose of achieving interoperability. 4.4 Ownership. If you modify or create a derivative work of the FontExplorer X Software, Monotype becomes the owner of the modified data and/or derivative work. 5. Purchases of Font Software through the FontExplorer X Pro Software 5.1 In order to purchase font software products through the FontExplorer X Pro Software, a Licensed User must register with Monotype. You agree to provide accurate, current, and complete information and to maintain and update the registration data as required. Personal data will be collected, processed and used only by Monotype and its affiliated companies to provide the services specified herein. In accordance with the principle of the efficient collection of data, Monotype will only collect personal data that is necessary to fulfill the contract and provide the services hereunder. 5.2 Any purchase of font software products made through the FontExplorer X Pro Software is subject to the respective foundries’ End User License Agreement (EULA). The EULAs may be updated by the respective foundry from time to time and the EULA in effect at the time a Licensed User purchases a particular font software product shall apply to that font software product. A breach of any such EULA will also constitute a breach of this Agreement. 6. Licensing Information The FontExplorer X Software may contain license information about the fonts that are loaded in its repository (e. g. number of licenses per font). To the extent that you or a Licensed User enter or change such license information, you agree that such information is and will be at all times correct and complete. 7. Reservation of Rights 7.1 You acknowledge that the FontExplorer X Software is protected by the copyright of the United States of America, by the copyright laws of other nations, and by international treaties. Neither you nor any Licensed User has rights to the FontExplorer X Software other than as expressly set forth in this Agreement. You agree that Monotype or its licensors owns all right, title and interest in and to the FontExplorer X Software, its structure, organization, code, and related files, including all property rights therein such as copyright, design and trademarks rights. You agree that the FontExplorer X Software, its structure, organization, code, and related files (including, without limitation, its metrics) are valuable property of Monotype and that any intentional Use of the FontExplorer X Software not expressly permitted by this Agreement constitutes a theft of valuable property. You agree to treat the FontExplorer X Software as you would any other copyrighted material, such as a book. All rights not expressly granted in this Agreement are expressly reserved to Monotype. 7.2 Monotype, the Monotype logo, FontExplorer X and other Monotype trademarks used in connection with the FontExplorer X Software are trademarks or registered trademarks of Monotype Imaging Inc. or Monotype GmbH in the U.S., Germany and/or other countries. Neither you nor any Licensed User is granted any right or license with respect to any of the aforementioned trademarks or any use of such trademarks. You agree to use trademarks associated with the FontExplorer X Software according to accepted trademark practice, including identification of the trademark owner’s name. The use of any trademark as herein authorized does not give you any rights of ownership in that trademark and all use of any trademark shall inure to the sole benefit of Monotype. 8. Warranty; Disclaimer of Warranty; Liability Limitations 8.1 Monotype warrants to you that the FontExplorer X Software will perform in accordance with its documentation for the ninety (90) day period following delivery. To make a warranty claim, you must, within the ninety (90) day warranty period, notify Monotype. 8.2 MONOTYPE DOES NOT WARRANT THE PERFORMANCE OR RESULTS YOU MAY OBTAIN BY USING THE FONTEXPLORER X SOFTWARE. TO THE GREATEST EXTENT PERMITTED BY LAW THE FOREGOING STATES THE SOLE AND EXCLUSIVE REMEDIES FOR MONOTYPE’S BREACH OF WARRANTY. EXCEPT FOR THE FOREGOING LIMITED WARRANTY, MONOTYPE MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, AS TO NON-INFRINGEMENT OF THIRD PARTY RIGHTS, MERCHANTABILITY, OR FITNESS FOR ANY PARTICULAR PURPOSE. 8.3 TO THE EXTENT PERMITTED BY THE APPLICABLE LAW MONOTYPE WILL NOT BE LIABLE TO YOU OR ANYONE ELSE (I) FOR ANY CONSEQUENTIAL, INCIDENTAL OR SPECIAL DAMAGES, INCLUDING WITHOUT LIMITATION ANY LOST PROFITS, LOST DATA, LOST BUSINESS OPPORTUNITIES, OR LOST SAVINGS, EVEN IF MONOTYPE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (II) FOR ANY CLAIM AGAINST YOU BY ANY THIRD PARTY SEEKING SUCH DAMAGES EVEN IF MONOTYPE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 8.4 THE ABOVE LIMITATIONS OF LIABILITY WILL NOT APPLY IF THE CAUSE OF THE DAMAGE WAS DELIBERATE OR DUE TO GROSS NEGLIGENCE OR IF PERSONAL INJURY HAS OCCURRED. NEITHER WILL IT APPLY IF YOU RAISE COMPULSORILY LEGALLY-BASED CLAIMS. 8.5 IN NO EVENT SHALL MONOTYPE’S LIABILITY EXCEED ONE HUNDRED THOUSAND EURO (€ 100,000.00), PROVIDED THAT THE APPLICABLE LAW PERMITS SUCH LIMITATION OF LIABILITY. 8.6 To the greatest extent permitted by law, any implied warranties not effectively excluded by this Agreement are limited to thirty (30) days. 9. Transfers Unless you acquire the FontExplorer X Software through a subscription or for a Trial Period you may transfer all your rights to Use the FontExplorer X Software to another person or legal entity provided that (i) all such software must be transferred simultaneously, (ii) the transferee accepts and agrees in writing to be bound by all the terms and conditions of this Agreement, (iii) you forward a copy of such writing to Monotype, (iv) you destroy all copies of the FontExplorer X Software not transferred to the transferee, including all copies stored in the memory of a hardware device, and (v) you cease all Use of the FontExplorer X Software. 10. Term and Termination 10.1 If you acquire the FontExplorer X Software through a subscription, this Agreement shall be effective as of the date of acceptance of this Agreement and subscription to the Monotype Web Fonts Service and will remain in effect for the term of such subscription unless earlier terminated in accordance with the terms hereof. If you acquire the FontExplorer X Software for a Trial Period, the term of a Trial Period shall be from the date of delivery of the FontExplorer X Software and shall terminate automatically after the period defined in the communication between you and Monotype. If no term is communicated then the Trial Period’s term shall automatically end thirty (30) days after the delivery. If you acquire the FontExplorer X Software by other means, this Agreement shall be effective as of the date of acceptance of this Agreement and will remain in effect unless terminated in accordance with the terms hereof. 10.2 If you or any Licensed User fails to comply with any of the provisions of this Agreement or any Licensed User fails to comply with the terms of a EULA relating to font software purchased through the FontExplorer X Pro Software, Monotype, at its sole discretion, may (i) terminate this Agreement and/or the account of any Licensed User, (ii) terminate any license to font software purchased through the FontExplorer X Pro Software, and/or (iii) preclude access to the service offered through the FontExplorer X Software. The termination of this Agreement shall not preclude Monotype from suing you for damages resulting from any breach of this Agreement or any EULA relating to purchased font software products. 10.3 You will remain liable for all amounts due to Monotype up to and including the date of termination. 10.4 Upon termination of this Agreement, you must destroy the original and any and all copies of, and cease all Use of, the FontExplorer X Software. 11. Miscellaneous 11.1 Governing Law and Forum. Unless you enter into this agreement through the Monotype affiliate Monotype Ltd. or Monotype GmbH, or unless otherwise set forth in writing in the agreement between you and Monotype, the agreement entered into between you and Monotype is governed by the laws of Massachusetts applicable to contracts wholly entered and performable within such Commonwealth (without regard to applicable conflict of laws provisions). The United States District Court for the District of Massachusetts or, if federal subject matter jurisdiction is lacking, the Superior Court of the Commonwealth of Massachusetts in Middlesex County, shall be the exclusive forum for any disputes arising out of or related to such agreement. Both you and Monotype agree to the personal jurisdiction and venue of these courts in any action related to such agreement. If you enter into this agreement through the Monotype affiliate Monotype Ltd. the agreement is governed by the laws of England and Wales (without regard to applicable conflict of laws provisions). The courts of London, England, shall be the exclusive forum for any disputes arising out of or related to such agreement. Both you and Monotype Ltd. agree to the personal jurisdiction and venue of these courts in any action related to such agreement. If you enter into this agreement through the Monotype affiliate Monotype GmbH the agreement is governed by the laws of Germany (without regard to applicable conflict of laws provisions). The courts of Frankfurt/Main, Germany, shall be the exclusive forum for any disputes arising out of or related to such agreement. Both you and Monotype GmbH agree to the personal jurisdiction and venue of these courts in any action related to such agreement. The agreement will not be governed by the United Nations Convention of Contracts for the International Sale of Goods, the application of which is expressly excluded. 11.2 Supplementary Support. If you have entered into a separate FontExplorer X Software support agreement or into another prior FontExplorer X Software agreement that included support, the support may continue as specified in the support agreement or prior FontExplorer X Software agreement, notwithstanding any change of the terms of this Agreement. The continued support may require a renewal of the respective agreement. 11.3 Entire Agreement. This Agreement, together with any agreement “clicked through” by you in connection with the installation of the FontExplorer X Pro Software or FontExplorer X Thin Client Software, constitutes the entire agreement between you and Monotype that governs the use of the FontExplorer X Software, superseding any prior agreements between you and Monotype. Each party owes to the other party a duty to co-operate in order to give full effect to this Agreement. 11.4 Severability. If any part of this Agreement is held invalid or unenforceable, that portion shall be construed in a manner consistent with applicable law to reflect, as nearly as possible, the original intention of the parties, and the remaining portions shall remain in full force and effect. 11.5 No Waiver. Monotype’s failure to enforce any right or provisions in this Agreement will not constitute a waiver of such provision, or any other provision of this Agreement. 11.6 Government End Users. If this product is acquired under the terms of a (i) GSA contract - use, reproduction or disclosure is subject to the restrictions set forth in the applicable ADP Schedule contract, (ii) DOD contract - use, duplication or disclosure by the Government is subject to the applicable restrictions set forth in DFARS 252.277-7013; (iii) Civilian agency contract - use, reproduction, or disclosure is subject to FAR 52.277-19(a) through (d) and restrictions set forth in the Agreement. FontExplorer X Software License Agreement clickthrough (v160909) Checksumming Driver Descriptor Map (DDM : 0)… Driver Descriptor Map (DDM : 0): verified CRC32 $DA8F7176 Checksumming Apple (Apple_partition_map : 1)… Apple (Apple_partition_map : 1): verified CRC32 $73B16945 Checksumming disk image (Apple_HFS : 2)… disk image (Apple_HFS : 2): verified CRC32 $256DD0EC Checksumming (Apple_Free : 3)… (Apple_Free : 3): verified CRC32 $00000000 verified CRC32 $2B19FAF6 /dev/disk2 Apple_partition_scheme /dev/disk2s1 Apple_partition_map /dev/disk2s2 Apple_HFS /Volumes/FontExplorer X Pro 2022-05-12 20:41:20 : INFO : fontexplorer : Mounted: /Volumes/FontExplorer X Pro 2022-05-12 20:41:20 : INFO : fontexplorer : Verifying: /Volumes/FontExplorer X Pro/FontExplorer X Pro.app 2022-05-12 20:41:20 : DEBUG : fontexplorer : App size: 353M /Volumes/FontExplorer X Pro/FontExplorer X Pro.app 2022-05-12 20:42:04 : DEBUG : fontexplorer : Debugging enabled, App Verification output was: /Volumes/FontExplorer X Pro/FontExplorer X Pro.app: accepted source=Notarized Developer ID origin=Developer ID Application: Linotype GmbH (2V7G2B7WG4) 2022-05-12 20:42:04 : INFO : fontexplorer : Team ID matching: 2V7G2B7WG4 (expected: 2V7G2B7WG4 ) 2022-05-12 20:42:04 : INFO : fontexplorer : Downloaded version of FontExplorer X Pro is 7.3.0 on versionKey CFBundleShortVersionString, same as installed. 2022-05-12 20:42:04 : DEBUG : fontexplorer : Unmounting /Volumes/FontExplorer X Pro 2022-05-12 20:42:15 : DEBUG : fontexplorer : Debugging enabled, Unmounting output was: "disk2" ejected. 2022-05-12 20:42:15 : DEBUG : fontexplorer : DEBUG mode 1, not reopening anything 2022-05-12 20:42:15 : REG : fontexplorer : No new version to install 2022-05-12 20:42:15 : REQ : fontexplorer : ################## End Installomator, exit code 0 --- fragments/labels/fontexplorer.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 fragments/labels/fontexplorer.sh diff --git a/fragments/labels/fontexplorer.sh b/fragments/labels/fontexplorer.sh new file mode 100755 index 0000000..b546380 --- /dev/null +++ b/fragments/labels/fontexplorer.sh @@ -0,0 +1,9 @@ +fontexplorer) + name="FontExplorer X Pro" + type="dmg" + packageID="com.linotype.FontExplorerX" + downloadURL="http://www.fontexplorerx.com/download/free-trial/Mac/" + appNewVersion=$( curl -fs http://fex.linotype.com/update/client/mac/pro/version.plist | grep string | tail -n 1 | sed 's/[^0-9.]//g' ) + expectedTeamID="2V7G2B7WG4" + ;; + From a1f0864b7d6f048449f858c3c2f385ca66852b5a Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Thu, 12 May 2022 20:47:57 +0200 Subject: [PATCH 76/91] Delete fontexplorer.sh --- fragments/labels/fontexplorer.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 fragments/labels/fontexplorer.sh diff --git a/fragments/labels/fontexplorer.sh b/fragments/labels/fontexplorer.sh deleted file mode 100755 index b546380..0000000 --- a/fragments/labels/fontexplorer.sh +++ /dev/null @@ -1,9 +0,0 @@ -fontexplorer) - name="FontExplorer X Pro" - type="dmg" - packageID="com.linotype.FontExplorerX" - downloadURL="http://www.fontexplorerx.com/download/free-trial/Mac/" - appNewVersion=$( curl -fs http://fex.linotype.com/update/client/mac/pro/version.plist | grep string | tail -n 1 | sed 's/[^0-9.]//g' ) - expectedTeamID="2V7G2B7WG4" - ;; - From 069651cf9f732cc6cb1f953652ed173cbf1b2a32 Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Thu, 12 May 2022 20:53:23 +0200 Subject: [PATCH 77/91] added L flag to curl Changed curl -fs to curl -fsL to cleanup logging. The usual -fsIL doesn't give me the newest version number. 2022-05-12 20:52:03 : REQ : filezilla : ################## Start Installomator v. 9.2beta, date 2022-05-12 2022-05-12 20:52:03 : INFO : filezilla : ################## Version: 9.2beta 2022-05-12 20:52:03 : INFO : filezilla : ################## Date: 2022-05-12 2022-05-12 20:52:03 : INFO : filezilla : ################## filezilla 2022-05-12 20:52:03 : DEBUG : filezilla : DEBUG mode 1 enabled. 2022-05-12 20:52:03 : INFO : filezilla : BLOCKING_PROCESS_ACTION=tell_user 2022-05-12 20:52:03 : INFO : filezilla : NOTIFY=success 2022-05-12 20:52:03 : INFO : filezilla : LOGGING=DEBUG 2022-05-12 20:52:04 : INFO : filezilla : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-12 20:52:04 : INFO : filezilla : Label type: tbz 2022-05-12 20:52:04 : INFO : filezilla : archiveName: FileZilla.tbz 2022-05-12 20:52:04 : DEBUG : filezilla : Changing directory to /Users/thijs/gits/Installomator/build 2022-05-12 20:52:04 : INFO : filezilla : No version found using packageID org.filezilla-project.filezilla 2022-05-12 20:52:04 : INFO : filezilla : App(s) found: /Applications/FileZilla.app 2022-05-12 20:52:04 : INFO : filezilla : found app at /Applications/FileZilla.app, version 3.59.0, on versionKey CFBundleShortVersionString 2022-05-12 20:52:04 : INFO : filezilla : appversion: 3.59.0 2022-05-12 20:52:04 : INFO : filezilla : Latest version of FileZilla is 3.59.0 2022-05-12 20:52:04 : WARN : filezilla : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-12 20:52:04 : INFO : filezilla : FileZilla.tbz exists and DEBUG mode 1 enabled, skipping download 2022-05-12 20:52:04 : REQ : filezilla : Installing FileZilla 2022-05-12 20:52:04 : INFO : filezilla : Unzipping FileZilla.tbz 2022-05-12 20:52:07 : INFO : filezilla : Verifying: /Users/thijs/gits/Installomator/build/FileZilla.app 2022-05-12 20:52:07 : DEBUG : filezilla : App size: 44M /Users/thijs/gits/Installomator/build/FileZilla.app 2022-05-12 20:52:07 : DEBUG : filezilla : Debugging enabled, App Verification output was: /Users/thijs/gits/Installomator/build/FileZilla.app: accepted source=Notarized Developer ID origin=Developer ID Application: Tim Kosse (5VPGKXL75N) 2022-05-12 20:52:07 : INFO : filezilla : Team ID matching: 5VPGKXL75N (expected: 5VPGKXL75N ) 2022-05-12 20:52:07 : INFO : filezilla : Downloaded version of FileZilla is 3.59.0 on versionKey CFBundleShortVersionString, same as installed. 2022-05-12 20:52:07 : DEBUG : filezilla : DEBUG mode 1, not reopening anything 2022-05-12 20:52:07 : REG : filezilla : No new version to install 2022-05-12 20:52:07 : REQ : filezilla : ################## End Installomator, exit code 0 --- fragments/labels/filezilla.sh | 4 ++-- fragments/labels/hype.sh | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100755 fragments/labels/hype.sh diff --git a/fragments/labels/filezilla.sh b/fragments/labels/filezilla.sh index 858c794..5ec9aa1 100755 --- a/fragments/labels/filezilla.sh +++ b/fragments/labels/filezilla.sh @@ -2,8 +2,8 @@ filezilla) name="FileZilla" type="tbz" packageID="org.filezilla-project.filezilla" - downloadURL=$(curl -fs https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '"' '{print $2}' ) - appNewVersion=$( curl -fs https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '_' '{print $2}' ) + downloadURL=$(curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '"' '{print $2}' ) + appNewVersion=$( curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '_' '{print $2}' ) expectedTeamID="5VPGKXL75N" blockingProcesses=( NONE ) ;; diff --git a/fragments/labels/hype.sh b/fragments/labels/hype.sh new file mode 100755 index 0000000..d00eb2f --- /dev/null +++ b/fragments/labels/hype.sh @@ -0,0 +1,9 @@ +hype) + name="Hype4" + type="dmg" + packageID="com.tumult.Hype4" + downloadURL="https://static.tumult.com/hype/download/Hype.dmg" + appNewVersion=$( curl -fs https://tumult.com/hype/download/all/ | grep Ongoing | awk -F '<' '{print $4}' | sed 's/[^0-9.]//g' ) + expectedTeamID="8J356DM772" + blockingProcesses=( NONE ) + ;; From a73eb144366df2615ecb1ba855fcb4b7dff8e91d Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Thu, 12 May 2022 20:54:33 +0200 Subject: [PATCH 78/91] Delete hype.sh --- fragments/labels/hype.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 fragments/labels/hype.sh diff --git a/fragments/labels/hype.sh b/fragments/labels/hype.sh deleted file mode 100755 index d00eb2f..0000000 --- a/fragments/labels/hype.sh +++ /dev/null @@ -1,9 +0,0 @@ -hype) - name="Hype4" - type="dmg" - packageID="com.tumult.Hype4" - downloadURL="https://static.tumult.com/hype/download/Hype.dmg" - appNewVersion=$( curl -fs https://tumult.com/hype/download/all/ | grep Ongoing | awk -F '<' '{print $4}' | sed 's/[^0-9.]//g' ) - expectedTeamID="8J356DM772" - blockingProcesses=( NONE ) - ;; From 27157e00c7d92be185a9be848082cb2bf7e4ddea Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Fri, 13 May 2022 09:28:04 +0200 Subject: [PATCH 79/91] added missing linebreak at end --- fragments/labels/shottr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/shottr.sh b/fragments/labels/shottr.sh index f9723d9..4c59809 100644 --- a/fragments/labels/shottr.sh +++ b/fragments/labels/shottr.sh @@ -4,4 +4,4 @@ shottr) downloadURL="https://shottr.cc/dl/Shottr-1.5.3.dmg" appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' ) expectedTeamID="2Y683PRQWN" - ;; \ No newline at end of file + ;; From ce857dd3727849ce98862d9a86f57957e9e78dcb Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Fri, 13 May 2022 09:29:51 +0200 Subject: [PATCH 80/91] adding FontExplorer 2022-05-13 09:28:24 : REQ : fontexplorer : ################## Start Installomator v. 9.2beta, date 2022-05-13 2022-05-13 09:28:24 : INFO : fontexplorer : ################## Version: 9.2beta 2022-05-13 09:28:24 : INFO : fontexplorer : ################## Date: 2022-05-13 2022-05-13 09:28:24 : INFO : fontexplorer : ################## fontexplorer 2022-05-13 09:28:24 : DEBUG : fontexplorer : DEBUG mode 1 enabled. 2022-05-13 09:28:24 : INFO : fontexplorer : BLOCKING_PROCESS_ACTION=tell_user 2022-05-13 09:28:24 : INFO : fontexplorer : NOTIFY=success 2022-05-13 09:28:24 : INFO : fontexplorer : LOGGING=DEBUG 2022-05-13 09:28:24 : INFO : fontexplorer : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-13 09:28:24 : INFO : fontexplorer : Label type: dmg 2022-05-13 09:28:24 : INFO : fontexplorer : archiveName: FontExplorer X Pro.dmg 2022-05-13 09:28:24 : INFO : fontexplorer : no blocking processes defined, using FontExplorer X Pro as default 2022-05-13 09:28:24 : DEBUG : fontexplorer : Changing directory to /Users/thijs/gits/Installomator/build 2022-05-13 09:28:24 : INFO : fontexplorer : No version found using packageID com.linotype.FontExplorerX 2022-05-13 09:28:24 : INFO : fontexplorer : App(s) found: /Applications/FontExplorer X Pro.app 2022-05-13 09:28:24 : INFO : fontexplorer : found app at /Applications/FontExplorer X Pro.app, version 7.3.0, on versionKey CFBundleShortVersionString 2022-05-13 09:28:24 : INFO : fontexplorer : appversion: 7.3.0 2022-05-13 09:28:24 : INFO : fontexplorer : Latest version of FontExplorer X Pro is 7.3.0 2022-05-13 09:28:24 : WARN : fontexplorer : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-13 09:28:24 : INFO : fontexplorer : FontExplorer X Pro.dmg exists and DEBUG mode 1 enabled, skipping download 2022-05-13 09:28:24 : DEBUG : fontexplorer : DEBUG mode 1, not checking for blocking processes 2022-05-13 09:28:24 : REQ : fontexplorer : Installing FontExplorer X Pro 2022-05-13 09:28:25 : INFO : fontexplorer : Mounting /Users/thijs/gits/Installomator/build/FontExplorer X Pro.dmg 2022-05-13 09:28:25 : DEBUG : fontexplorer : Debugging enabled, dmgmount output was: /dev/disk2 Apple_partition_scheme /dev/disk2s1 Apple_partition_map /dev/disk2s2 Apple_HFS /Volumes/FontExplorer X Pro 2022-05-13 09:28:25 : INFO : fontexplorer : Mounted: /Volumes/FontExplorer X Pro 2022-05-13 09:28:25 : INFO : fontexplorer : Verifying: /Volumes/FontExplorer X Pro/FontExplorer X Pro.app 2022-05-13 09:28:25 : DEBUG : fontexplorer : App size: 353M /Volumes/FontExplorer X Pro/FontExplorer X Pro.app 2022-05-13 09:28:28 : DEBUG : fontexplorer : Debugging enabled, App Verification output was: /Volumes/FontExplorer X Pro/FontExplorer X Pro.app: accepted source=Notarized Developer ID origin=Developer ID Application: Linotype GmbH (2V7G2B7WG4) 2022-05-13 09:28:28 : INFO : fontexplorer : Team ID matching: 2V7G2B7WG4 (expected: 2V7G2B7WG4 ) 2022-05-13 09:28:28 : INFO : fontexplorer : Downloaded version of FontExplorer X Pro is 7.3.0 on versionKey CFBundleShortVersionString, same as installed. 2022-05-13 09:28:28 : DEBUG : fontexplorer : Unmounting /Volumes/FontExplorer X Pro 2022-05-13 09:28:28 : DEBUG : fontexplorer : Debugging enabled, Unmounting output was: "disk2" ejected. 2022-05-13 09:28:28 : DEBUG : fontexplorer : DEBUG mode 1, not reopening anything 2022-05-13 09:28:28 : REG : fontexplorer : No new version to install 2022-05-13 09:28:28 : REQ : fontexplorer : ################## End Installomator, exit code 0 --- fragments/labels/fontexplorer.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 fragments/labels/fontexplorer.sh diff --git a/fragments/labels/fontexplorer.sh b/fragments/labels/fontexplorer.sh new file mode 100755 index 0000000..f2699da --- /dev/null +++ b/fragments/labels/fontexplorer.sh @@ -0,0 +1,9 @@ +fontexplorer) + name="FontExplorer X Pro" + type="dmg" + packageID="com.linotype.FontExplorerX" + downloadURL="http://www.fontexplorerx.com/download/free-trial/Mac/" + appNewVersion=$( curl -fsL http://fex.linotype.com/update/client/mac/pro/version.plist | grep string | tail -n 1 | sed 's/[^0-9.]//g' ) + expectedTeamID="2V7G2B7WG4" + ;; + From c6dbf15995359aa9fe9b53d6506e0a31683c4c0d Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Fri, 13 May 2022 09:31:45 +0200 Subject: [PATCH 81/91] add missing `;;` at end of label --- fragments/labels/linear.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fragments/labels/linear.sh b/fragments/labels/linear.sh index d44e238..3416995 100644 --- a/fragments/labels/linear.sh +++ b/fragments/labels/linear.sh @@ -11,3 +11,5 @@ linear) versionKey="CFBundleShortVersionString" appName="Linear.app" blockingProcesses=( "Linear" ) + ;; + From f7d903bc87aa8e95a8ba0e3050a475dae6b9bb5e Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Fri, 13 May 2022 09:33:55 +0200 Subject: [PATCH 82/91] Adding hype (4) 2022-05-13 09:32:43 : REQ : hype : ################## Start Installomator v. 9.2beta, date 2022-05-13 2022-05-13 09:32:43 : INFO : hype : ################## Version: 9.2beta 2022-05-13 09:32:43 : INFO : hype : ################## Date: 2022-05-13 2022-05-13 09:32:43 : INFO : hype : ################## hype 2022-05-13 09:32:43 : DEBUG : hype : DEBUG mode 1 enabled. 2022-05-13 09:32:43 : INFO : hype : BLOCKING_PROCESS_ACTION=tell_user 2022-05-13 09:32:43 : INFO : hype : NOTIFY=success 2022-05-13 09:32:43 : INFO : hype : LOGGING=DEBUG 2022-05-13 09:32:43 : INFO : hype : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-13 09:32:43 : INFO : hype : Label type: dmg 2022-05-13 09:32:43 : INFO : hype : archiveName: Hype4.dmg 2022-05-13 09:32:44 : DEBUG : hype : Changing directory to /Users/thijs/gits/Installomator/build 2022-05-13 09:32:44 : INFO : hype : No version found using packageID com.tumult.Hype4 2022-05-13 09:32:44 : INFO : hype : App(s) found: /Applications/Hype4.app 2022-05-13 09:32:44 : INFO : hype : found app at /Applications/Hype4.app, version 4.1.8, on versionKey CFBundleShortVersionString 2022-05-13 09:32:44 : INFO : hype : appversion: 4.1.8 2022-05-13 09:32:44 : INFO : hype : Latest version of Hype4 is 4.1.8 2022-05-13 09:32:44 : WARN : hype : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-13 09:32:44 : INFO : hype : Hype4.dmg exists and DEBUG mode 1 enabled, skipping download 2022-05-13 09:32:44 : REQ : hype : Installing Hype4 2022-05-13 09:32:44 : INFO : hype : Mounting /Users/thijs/gits/Installomator/build/Hype4.dmg 2022-05-13 09:32:44 : DEBUG : hype : Debugging enabled, dmgmount output was: /dev/disk2 Apple_partition_scheme /dev/disk2s1 Apple_partition_map /dev/disk2s2 Apple_HFS /Volumes/Hype 4.1.8 2022-05-13 09:32:44 : INFO : hype : Mounted: /Volumes/Hype 4.1.8 2022-05-13 09:32:44 : INFO : hype : Verifying: /Volumes/Hype 4.1.8/Hype4.app 2022-05-13 09:32:44 : DEBUG : hype : App size: 50M /Volumes/Hype 4.1.8/Hype4.app 2022-05-13 09:32:47 : DEBUG : hype : Debugging enabled, App Verification output was: /Volumes/Hype 4.1.8/Hype4.app: accepted source=Notarized Developer ID origin=Developer ID Application: Tumult Inc. (8J356DM772) 2022-05-13 09:32:47 : INFO : hype : Team ID matching: 8J356DM772 (expected: 8J356DM772 ) 2022-05-13 09:32:47 : INFO : hype : Downloaded version of Hype4 is 4.1.8 on versionKey CFBundleShortVersionString, same as installed. 2022-05-13 09:32:47 : DEBUG : hype : Unmounting /Volumes/Hype 4.1.8 2022-05-13 09:32:47 : DEBUG : hype : Debugging enabled, Unmounting output was: "disk2" ejected. 2022-05-13 09:32:47 : DEBUG : hype : DEBUG mode 1, not reopening anything 2022-05-13 09:32:47 : REG : hype : No new version to install 2022-05-13 09:32:47 : REQ : hype : ################## End Installomator, exit code 0 --- fragments/labels/hype.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 fragments/labels/hype.sh diff --git a/fragments/labels/hype.sh b/fragments/labels/hype.sh new file mode 100755 index 0000000..2a292cf --- /dev/null +++ b/fragments/labels/hype.sh @@ -0,0 +1,9 @@ +hype) + name="Hype4" + type="dmg" + packageID="com.tumult.Hype4" + downloadURL="https://static.tumult.com/hype/download/Hype.dmg" + appNewVersion=$( curl -fsL https://tumult.com/hype/download/all/ | grep Ongoing | awk -F '<' '{print $4}' | sed 's/[^0-9.]//g' ) + expectedTeamID="8J356DM772" + blockingProcesses=( NONE ) + ;; From 5c43199ee629710a47251636fc8d1df35a763bc8 Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Fri, 13 May 2022 09:38:58 +0200 Subject: [PATCH 83/91] adding imageoptim 2022-05-13 09:37:14 : REQ : imageoptim : ################## Start Installomator v. 9.2beta, date 2022-05-13 2022-05-13 09:37:14 : INFO : imageoptim : ################## Version: 9.2beta 2022-05-13 09:37:15 : INFO : imageoptim : ################## Date: 2022-05-13 2022-05-13 09:37:15 : INFO : imageoptim : ################## imageoptim 2022-05-13 09:37:15 : DEBUG : imageoptim : DEBUG mode 1 enabled. 2022-05-13 09:37:15 : INFO : imageoptim : BLOCKING_PROCESS_ACTION=tell_user 2022-05-13 09:37:15 : INFO : imageoptim : NOTIFY=success 2022-05-13 09:37:15 : INFO : imageoptim : LOGGING=DEBUG 2022-05-13 09:37:15 : INFO : imageoptim : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-13 09:37:15 : INFO : imageoptim : Label type: tbz 2022-05-13 09:37:15 : INFO : imageoptim : archiveName: imageoptim.tbz 2022-05-13 09:37:15 : DEBUG : imageoptim : Changing directory to /Users/thijs/gits/Installomator/build 2022-05-13 09:37:15 : INFO : imageoptim : No version found using packageID net.pornel.ImageOptim 2022-05-13 09:37:15 : INFO : imageoptim : App(s) found: /Applications/imageoptim.app 2022-05-13 09:37:15 : INFO : imageoptim : found app at /Applications/imageoptim.app, version 1.8.8, on versionKey CFBundleShortVersionString 2022-05-13 09:37:15 : INFO : imageoptim : appversion: 1.8.8 2022-05-13 09:37:15 : INFO : imageoptim : Latest version of imageoptim is 1.8.8 2022-05-13 09:37:15 : WARN : imageoptim : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-13 09:37:15 : INFO : imageoptim : imageoptim.tbz exists and DEBUG mode 1 enabled, skipping download 2022-05-13 09:37:15 : REQ : imageoptim : Installing imageoptim 2022-05-13 09:37:15 : INFO : imageoptim : Unzipping imageoptim.tbz 2022-05-13 09:37:16 : INFO : imageoptim : Verifying: /Users/thijs/gits/Installomator/build/imageoptim.app 2022-05-13 09:37:16 : DEBUG : imageoptim : App size: 11M /Users/thijs/gits/Installomator/build/imageoptim.app 2022-05-13 09:37:16 : DEBUG : imageoptim : Debugging enabled, App Verification output was: /Users/thijs/gits/Installomator/build/imageoptim.app: accepted source=Notarized Developer ID origin=Developer ID Application: Kornel Lesinski (59KZTZA4XR) 2022-05-13 09:37:16 : INFO : imageoptim : Team ID matching: 59KZTZA4XR (expected: 59KZTZA4XR ) 2022-05-13 09:37:16 : INFO : imageoptim : Downloaded version of imageoptim is 1.8.8 on versionKey CFBundleShortVersionString, same as installed. 2022-05-13 09:37:16 : DEBUG : imageoptim : DEBUG mode 1, not reopening anything 2022-05-13 09:37:16 : REG : imageoptim : No new version to install 2022-05-13 09:37:16 : REQ : imageoptim : ################## End Installomator, exit code 0 --- fragments/labels/imageoptim.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 fragments/labels/imageoptim.sh diff --git a/fragments/labels/imageoptim.sh b/fragments/labels/imageoptim.sh new file mode 100755 index 0000000..7b0b997 --- /dev/null +++ b/fragments/labels/imageoptim.sh @@ -0,0 +1,9 @@ +imageoptim) + name="imageoptim" + type="tbz" + packageID="net.pornel.ImageOptim" + downloadURL="https://imageoptim.com/ImageOptim.tbz2" + appNewVersion=$( curl -fsL https://imageoptim.com/appcast.xml | grep "title" | tail -n 1 | sed 's/[^0-9.]//g' ) + expectedTeamID="59KZTZA4XR" + blockingProcesses=( NONE ) + ;; From 9a154b80b7dcc35d8d5ca7778482390aa078db32 Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Fri, 13 May 2022 09:41:49 +0200 Subject: [PATCH 84/91] Adding app Pika 2022-05-13 09:41:32 : REQ : pika : ################## Start Installomator v. 9.2beta, date 2022-05-13 2022-05-13 09:41:32 : INFO : pika : ################## Version: 9.2beta 2022-05-13 09:41:32 : INFO : pika : ################## Date: 2022-05-13 2022-05-13 09:41:32 : INFO : pika : ################## pika 2022-05-13 09:41:32 : DEBUG : pika : DEBUG mode 1 enabled. 2022-05-13 09:41:33 : INFO : pika : BLOCKING_PROCESS_ACTION=tell_user 2022-05-13 09:41:33 : INFO : pika : NOTIFY=success 2022-05-13 09:41:33 : INFO : pika : LOGGING=DEBUG 2022-05-13 09:41:33 : INFO : pika : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-13 09:41:33 : INFO : pika : Label type: dmg 2022-05-13 09:41:33 : INFO : pika : archiveName: Pika.dmg 2022-05-13 09:41:33 : DEBUG : pika : Changing directory to /Users/thijs/gits/Installomator/build 2022-05-13 09:41:33 : INFO : pika : No version found using packageID com.superhighfives.Pika 2022-05-13 09:41:33 : INFO : pika : App(s) found: /Applications/Pika.app 2022-05-13 09:41:33 : INFO : pika : found app at /Applications/Pika.app, version 0.0.12, on versionKey CFBundleShortVersionString 2022-05-13 09:41:33 : INFO : pika : appversion: 0.0.12 2022-05-13 09:41:33 : INFO : pika : Latest version of Pika is 0.0.12 2022-05-13 09:41:33 : WARN : pika : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-13 09:41:33 : INFO : pika : Pika.dmg exists and DEBUG mode 1 enabled, skipping download 2022-05-13 09:41:33 : REQ : pika : Installing Pika 2022-05-13 09:41:33 : INFO : pika : Mounting /Users/thijs/gits/Installomator/build/Pika.dmg 2022-05-13 09:41:33 : DEBUG : pika : Debugging enabled, dmgmount output was: expected CRC32 $02D39DFE /dev/disk2 GUID_partition_scheme /dev/disk2s1 Apple_HFS /Volumes/Pika 2022-05-13 09:41:34 : INFO : pika : Mounted: /Volumes/Pika 2022-05-13 09:41:34 : INFO : pika : Verifying: /Volumes/Pika/Pika.app 2022-05-13 09:41:34 : DEBUG : pika : App size: 8.0M /Volumes/Pika/Pika.app 2022-05-13 09:41:34 : DEBUG : pika : Debugging enabled, App Verification output was: /Volumes/Pika/Pika.app: accepted source=Notarized Developer ID origin=Developer ID Application: Charlie Gleason (TGHU37N6EX) 2022-05-13 09:41:34 : INFO : pika : Team ID matching: TGHU37N6EX (expected: TGHU37N6EX ) 2022-05-13 09:41:34 : INFO : pika : Downloaded version of Pika is 0.0.12 on versionKey CFBundleShortVersionString, same as installed. 2022-05-13 09:41:34 : DEBUG : pika : Unmounting /Volumes/Pika 2022-05-13 09:41:34 : DEBUG : pika : Debugging enabled, Unmounting output was: "disk2" ejected. 2022-05-13 09:41:34 : DEBUG : pika : DEBUG mode 1, not reopening anything 2022-05-13 09:41:34 : REG : pika : No new version to install 2022-05-13 09:41:34 : REQ : pika : ################## End Installomator, exit code 0 --- fragments/labels/pika.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 fragments/labels/pika.sh diff --git a/fragments/labels/pika.sh b/fragments/labels/pika.sh new file mode 100755 index 0000000..281089b --- /dev/null +++ b/fragments/labels/pika.sh @@ -0,0 +1,9 @@ +pika) + name="Pika" + type="dmg" + packageID="com.superhighfives.Pika" + downloadURL=$(downloadURLFromGit "superhighfives" "pika") + appNewVersion=$(versionFromGit "superhighfives" "pika") + expectedTeamID="TGHU37N6EX" + blockingProcesses=( NONE ) + ;; From 3aafdde17887b39e6e5628f80c19b50f8582eccb Mon Sep 17 00:00:00 2001 From: madtice <50694988+madtice@users.noreply.github.com> Date: Fri, 13 May 2022 09:44:41 +0200 Subject: [PATCH 85/91] adding Xerox Workcentre 7800 drivers 2022-05-13 09:43:48 : REQ : xeroxworkcentre7800 : ################## Start Installomator v. 9.2beta, date 2022-05-13 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : ################## Version: 9.2beta 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : ################## Date: 2022-05-13 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : ################## xeroxworkcentre7800 2022-05-13 09:43:48 : DEBUG : xeroxworkcentre7800 : DEBUG mode 1 enabled. 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : BLOCKING_PROCESS_ACTION=tell_user 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : NOTIFY=success 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : LOGGING=DEBUG 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : Label type: pkgInDmg 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : archiveName: XeroxWorkCentre.dmg 2022-05-13 09:43:48 : DEBUG : xeroxworkcentre7800 : Changing directory to /Users/thijs/gits/Installomator/build 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : Custom App Version detection is used, found 5.10.1 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : appversion: 5.10.1 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : Latest version of XeroxWorkCentre is 5.10.1 2022-05-13 09:43:48 : WARN : xeroxworkcentre7800 : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : XeroxWorkCentre.dmg exists and DEBUG mode 1 enabled, skipping download 2022-05-13 09:43:48 : REQ : xeroxworkcentre7800 : Installing XeroxWorkCentre 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : Mounting /Users/thijs/gits/Installomator/build/XeroxWorkCentre.dmg 2022-05-13 09:43:48 : DEBUG : xeroxworkcentre7800 : Debugging enabled, dmgmount output was: expected CRC32 $562A7F63 /dev/disk2 GUID_partition_scheme /dev/disk2s1 Apple_HFS /Volumes/Xerox Drivers 5.10.1 2022-05-13 09:43:48 : INFO : xeroxworkcentre7800 : Mounted: /Volumes/Xerox Drivers 5.10.1 2022-05-13 09:43:49 : DEBUG : xeroxworkcentre7800 : Found pkg(s): /Volumes/Xerox Drivers 5.10.1/Xerox Drivers 5.10.1.pkg 2022-05-13 09:43:49 : INFO : xeroxworkcentre7800 : found pkg: /Volumes/Xerox Drivers 5.10.1/Xerox Drivers 5.10.1.pkg 2022-05-13 09:43:49 : INFO : xeroxworkcentre7800 : Verifying: /Volumes/Xerox Drivers 5.10.1/Xerox Drivers 5.10.1.pkg 2022-05-13 09:43:49 : DEBUG : xeroxworkcentre7800 : File list: -rw-r--r-- 1 root staff 85M Apr 19 15:58 /Volumes/Xerox Drivers 5.10.1/Xerox Drivers 5.10.1.pkg 2022-05-13 09:43:49 : DEBUG : xeroxworkcentre7800 : File type: /Volumes/Xerox Drivers 5.10.1/Xerox Drivers 5.10.1.pkg: xar archive compressed TOC: 31493, SHA-1 checksum 2022-05-13 09:43:49 : DEBUG : xeroxworkcentre7800 : spctlOut is /Volumes/Xerox Drivers 5.10.1/Xerox Drivers 5.10.1.pkg: accepted 2022-05-13 09:43:49 : DEBUG : xeroxworkcentre7800 : source=Notarized Developer ID 2022-05-13 09:43:49 : DEBUG : xeroxworkcentre7800 : origin=Developer ID Installer: Xerox Corporation (G59Y3XFNFR) 2022-05-13 09:43:49 : INFO : xeroxworkcentre7800 : Team ID: G59Y3XFNFR (expected: G59Y3XFNFR ) 2022-05-13 09:43:49 : DEBUG : xeroxworkcentre7800 : DEBUG enabled, skipping installation 2022-05-13 09:43:49 : INFO : xeroxworkcentre7800 : Finishing... 2022-05-13 09:43:59 : INFO : xeroxworkcentre7800 : Custom App Version detection is used, found 5.10.1 2022-05-13 09:43:59 : REQ : xeroxworkcentre7800 : Installed XeroxWorkCentre, version 5.10.1 2022-05-13 09:43:59 : INFO : xeroxworkcentre7800 : notifying 2022-05-13 09:43:59 : DEBUG : xeroxworkcentre7800 : Unmounting /Volumes/Xerox Drivers 5.10.1 2022-05-13 09:43:59 : DEBUG : xeroxworkcentre7800 : Debugging enabled, Unmounting output was: "disk2" ejected. 2022-05-13 09:43:59 : DEBUG : xeroxworkcentre7800 : DEBUG mode 1, not reopening anything 2022-05-13 09:43:59 : REQ : xeroxworkcentre7800 : All done! 2022-05-13 09:43:59 : REQ : xeroxworkcentre7800 : ################## End Installomator, exit code 0 --- fragments/labels/xeroxworkcentre7800.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 fragments/labels/xeroxworkcentre7800.sh diff --git a/fragments/labels/xeroxworkcentre7800.sh b/fragments/labels/xeroxworkcentre7800.sh new file mode 100755 index 0000000..c494c47 --- /dev/null +++ b/fragments/labels/xeroxworkcentre7800.sh @@ -0,0 +1,9 @@ +xeroxworkcentre7800) + name="XeroxWorkCentre" + type="pkgInDmg" + appCustomVersion(){ lpinfo -m | grep 783 | tail -n 1 | awk -F ', ' '{print $2}' } + appNewVersion=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | grep .dmg | head -n 1 | awk -F '_' '{print $2}' ) + downloadURL=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | xmllint --html --format - 2>/dev/null | grep -o "https://.*XeroxDrivers.*.dmg" ) + expectedTeamID="G59Y3XFNFR" + blockingProcesses=( NONE ) +;; From bd41912310cd8cc9a2ec9eb59d54cf03ca5e1399 Mon Sep 17 00:00:00 2001 From: Fletcher Salesky Date: Fri, 13 May 2022 12:06:13 -0700 Subject: [PATCH 86/91] Update README.md shields.io badges urls Now pointed to Installomator/Installomator instead of scriptingosx/Installomator Fixes Release and Downloads badges showing "no releases or repo found" error --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a13591e..0002ba3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ _The one installer script to rule them all._ -![](https://img.shields.io/github/v/release/scriptingosx/Installomator) ![](https://img.shields.io/github/downloads/scriptingosx/Installomator/latest/total) ![](https://img.shields.io/badge/macOS-10.14%2B-success) ![](https://img.shields.io/github/license/scriptingosx/Installomator) +![](https://img.shields.io/github/v/release/Installomator/Installomator) ![](https://img.shields.io/github/downloads/Installomator/Installomator/latest/total) ![](https://img.shields.io/badge/macOS-10.14%2B-success) ![](https://img.shields.io/github/license/Installomator/Installomator) This script is in the “we find it useful, it is working for us” stage. From 4420ce2cf9f27986241851d9363bf0e9817014fb Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Mon, 16 May 2022 12:47:29 +0200 Subject: [PATCH 87/91] Update README.md --- utils/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/utils/README.md b/utils/README.md index 7891f2b..dad799a 100644 --- a/utils/README.md +++ b/utils/README.md @@ -59,14 +59,16 @@ Pull requests against the `Installomator.sh` script in the root of the repo will ### When you are familiar with git and GitHub -- Create a new branch in your local Installomator fork repo. +- If you haven't already, create a fork of the Installomator repo. Clone the for to your local Mac. +- Create a new branch in your local Installomator (fork) repo. - Copy the new or modified label file to `fragments/labels`. (replacing the original, when necessary) -- Create a pull request against the main Installomator dev branch. -- Don't use this branch for any other modifications, unless you need to update this particular PR. (Pull Requests are against a _branch_, not a particular commit.) +- Test (push the change to your fork on GitHub. You can check that out on testing devices or vms.) +- Create a pull request against the Installomator `main` branch. +- Don't use this branch for _any_ other modifications, unless you need to update this particular PR. (Pull Requests are against a _branch_, not a particular commit.) -If you have multiple labels you want to contribute, please create a separate local branch and a separate pull request for each label. +If you have multiple labels (or other changes) you want to contribute, please create a _separate_ local branch and a _separate_ pull request for each label. This allows us to accept, modify, or reject each label separately and simplifies the process. -Once your Pull Request is merged into the main repo, you can pull the change to your fork and delete the branch. +Once your Pull Request is merged into the main repo, you can pull the change to your local repo, push it to your fork, and delete the branch, because it should be fully merged. ### When you are not familiar with git and GitHub From e8d56b585cf0f500bb4dde1fe78d17829b63b376 Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Mon, 16 May 2022 14:37:05 +0200 Subject: [PATCH 88/91] Updated idrivethin revised downloadurl and appnewversion --- fragments/labels/idrivethin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fragments/labels/idrivethin.sh b/fragments/labels/idrivethin.sh index c4ff619..c6b1cf4 100644 --- a/fragments/labels/idrivethin.sh +++ b/fragments/labels/idrivethin.sh @@ -2,8 +2,8 @@ idrivethin) name="IDrive" type="pkgInDmg" pkgName="IDriveThin.pkg" - downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thinclient-mac\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') - appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed 's/.*thin_mac_ver=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thinclient-mac([^;]*).*/\1/g' | sed -E 's/.*(https.*dmg).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thin\_mac\_ver\=\"Version\ ([0-9.]*).*/\1/g') versionKey="CFBundleVersion" expectedTeamID="JWDCNYZ922" ;; From 84b9a98e136b7486ece927a2db6345be3690035e Mon Sep 17 00:00:00 2001 From: worthypants <6388066+worthypants@users.noreply.github.com> Date: Mon, 16 May 2022 14:46:10 +0200 Subject: [PATCH 89/91] updated label idrive corrected downloadURL and appNewVersion --- fragments/labels/idrive.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fragments/labels/idrive.sh b/fragments/labels/idrive.sh index 6a16c03..31dca50 100644 --- a/fragments/labels/idrive.sh +++ b/fragments/labels/idrive.sh @@ -2,8 +2,8 @@ idrive) name="IDrive" type="pkgInDmg" pkgName="IDrive.pkg" - downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*href\([^;]*\).*/\1/' | sed 's/.*\(https.*dmg\).*/\1/g') - appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed 's/.*mac_vernum=\([^;]*\).*/\1/' | sed 's/.*Version \([0-9.]*\).*/\1/') + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*(https.*dmg).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*mac_vernum\=\"Version\ ([0-9.]*).*/\1/g') versionKey="CFBundleVersion" expectedTeamID="JWDCNYZ922" ;; From ed8e9ef9134dc412c37a0b1375d8b8f19316e988 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Mon, 16 May 2022 20:12:48 +0200 Subject: [PATCH 90/91] general cleanup in prep for release --- CHANGELOG.md | 71 ++- Installomator.sh | 563 +++++++++++++++--- Labels.txt | 38 ++ fragments/labels/1password8.sh | 2 +- fragments/labels/amazoncorretto8jdk.sh | 2 +- fragments/labels/androidstudio.sh | 2 +- fragments/labels/camtasia2020.sh | 1 - fragments/labels/postman.sh | 2 +- fragments/labels/propresenter7.sh | 2 +- fragments/labels/snagit2019.sh | 1 - fragments/labels/snagit2020.sh | 1 - fragments/labels/sonobus.sh | 16 +- .../{UltimakerCura.sh => ultimakercura.sh} | 0 fragments/labels/unnaturalscrollwheels.sh | 2 +- fragments/version.sh | 2 +- 15 files changed, 607 insertions(+), 98 deletions(-) rename fragments/labels/{UltimakerCura.sh => ultimakercura.sh} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51dd579..2abbe4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,75 @@ +## v9.2 + +**Note**: Both Google and Mozilla recommend using the pkg installers instead of the dmg downloads for managed deployments. So far, Installomator has provided labels for both. (`googlechrome` and `googlechromepkg` or `firefox` and `firefoxpkg`, respectively) Since there are problems with the dmg downloads, a future release of Installomator will _disable_ the `firefox` and `googlechrome` dmg labels. You should switch to using `googlechromepkg` and `firefoxpkg` labels instead. + +- bug fix (#434) +- documentation updates (#485, #494) +- new labels: + - 1password8 (#514) + - UltimakerCura + - androidstudio (#547) + - atextlegacy (#464) + - camtasia2019, camtasia2020 (#499) + - clue, cluefull (#481) + - craftmanagerforsketch + - displaylinkmanager (#448) + - drawio (#480) + - duckduckgo + - egnytewebedit (#512) + - filezilla (#522) + - firefoxpkg_intl + - flycut (#501) + - fontexplorer (#523) + - hype (#524) + - idrive (#507), idrivethin (#509) + - imageoptim (#525) + - linear (#519) + - macoslaps (#502) + - mightymike + - mindmanager (#479) + - pika (#526) + - propresenter7 (#394) + - qgis-pr + - shottr (#516) + - slab (#487) + - snagit2019, snagit2020, snagit2021 (#498) + - sonobus (#490) + - talkdeskcxcloud (#452) + - thunderbird_intl (#497) + - unnaturalscrollwheels (#503) + - wechat (#510) + - xeroxworkcentre7800 (#527) + - zohoworkdrivegenie +- updated labels + - adobereaderdc-update, adobereaderdc (#503) + - amazoncorretto8jdk (#461) + - camtasia (#499) + - citrixworkspace (#508) + - dbeaverce (#450) + - dropbox + - firefox + - firefox_da + - firefox_intl (#495) + - firefoxesr_intl (#496) + - firefoxpkg + - googlechrome, googlechromepkg (#484) + - gpgsuite (#465) + - grammarly (#515) + - logitechoptions (#478) + - onlyofficedesktop (#454) + - postman (#458) + - rancherdesktop (#463) + - remotedesktopmanagerenterprise + - remotedesktopmanagerfree + - ringcentralapp (#492) + - sketch + - snagit (#498) + - talkdeskcallbar (#453) + + + ## v9.1 -**Note**: Both Google and Mozilla recommend using the pkg installers instead of the dmg downloads for managed deployments. So far, Installomator has provided labels for both. (`googlechrome` and `googlechromepkg` or `firefox` and `firefoxpkg`, respectively) Since there are problems with the dmg downloads, a future release of Installomator will _disable_ the `firefox` and `googlechrome` dmg labels. You should switch to using the respective pkg labels instead. - added option for Microsoft Endpoint Manager (Intune) to `LOGO` (#446) - minor fixes (#427, #434, #436) diff --git a/Installomator.sh b/Installomator.sh index 206a741..8a70fb1 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -238,7 +238,7 @@ IGNORE_DND_APPS="" # - updateToolArguments: # When Installomator detects an existing installation of the application, # and the updateTool variable is set -# $updateTool $updateArguments +# $updateTool $updateArguments # Will be run instead of of downloading and installing a complete new version. # Use this when the updateTool does differential and optimized downloads. # e.g. msupdate on various Microsoft labels @@ -253,7 +253,7 @@ IGNORE_DND_APPS="" # We need to define `name` for the installed app (to be version checked), as well as # `installerTool` for the installer app (if named differently than `name`. Installomator # will add the path to the folder/disk image with the binary, and it will be called like this: - `$CLIInstaller $CLIArguments` +# $CLIInstaller $CLIArguments # For most installations `CLIInstaller` should contain the `installerTool` for the CLI call # (if it’s the same). # We can support a whole range of other software titles by implementing this. @@ -302,8 +302,8 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then rosetta2=no fi fi -VERSION="9.1" -VERSIONDATE="2022-03-18" +VERSION="9.2" +VERSIONDATE="2022-05-16" # MARK: Functions @@ -549,8 +549,8 @@ getAppVersion() { # printlog "App(s) found: ${applist}" DEBUG # applist=$(mdfind "kind:application AND name:$appName" -0 ) fi - if [[ -z applist ]]; then - printlog "No previous app found" INFO + if [[ -z $applist ]]; then + printlog "No previous app found" WARN else printlog "App(s) found: ${applist}" INFO fi @@ -572,7 +572,7 @@ getAppVersion() { if [[ -d "$installedAppPath"/Contents/_MASReceipt ]];then printlog "Installed $appName is from App Store, use “IGNORE_APP_STORE_APPS=yes” to replace." if [[ $IGNORE_APP_STORE_APPS == "yes" ]]; then - printlog "Replacing App Store apps, no matter the version" + printlog "Replacing App Store apps, no matter the version" WARN appversion=0 else cleanupAndExit 1 "App previously installed from App Store, and we respect that" ERROR @@ -1387,7 +1387,7 @@ adobecreativeclouddesktop) adobereaderdc-update) name="Adobe Acrobat Reader DC" type="pkgInDmg" - downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo http://ardownload.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDCUpd"$adobecurrent"_MUI.dmg) + downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg) appNewVersion=$(curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt) #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" @@ -1398,7 +1398,8 @@ adobereaderdc-install) name="Adobe Acrobat Reader DC" type="pkgInDmg" packageID="com.adobe.acrobat.DC.reader.app.pkg.MUI" - downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\]",' | head -n 1 | cut -d \" -f 4) + #downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\]",' | head -n 1 | cut -d \" -f 4) + downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg) appNewVersion=$(curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt) #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" @@ -1467,8 +1468,13 @@ amazonchime) amazoncorretto8jdk) name="Amazon Corretto 8 JDK" type="pkg" - downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg" - appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}') + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-aarch64-macos-jdk.pkg" + appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}') + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg" + appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}') + fi expectedTeamID="94KV3E626L" ;; amazonworkspaces) @@ -1485,6 +1491,19 @@ androidfiletransfer) downloadURL="https://dl.google.com/dl/androidjumper/mtp/current/AndroidFileTransfer.dmg" expectedTeamID="EQHXZ8M8AV" ;; +androidstudio) + name="Android Studio" + type="dmg" + if [[ $(arch) == arm64 ]]; then + downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i arm.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1) + appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' ) + elif [[ $(arch) == i386 ]]; then + downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i mac.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1) + appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' ) + fi + expectedTeamID="EQHXZ8M8AV" + blockingProcesses=( androidstudio ) + ;; anydesk) name="AnyDesk" type="dmg" @@ -1580,12 +1599,12 @@ atext) expectedTeamID="KHEMQ2FD9E" ;; atextlegacy) - # credit: Gabe Marchan (gabemarchan.com - @darklink87) - name="aText" - type="dmg" - downloadURL="https://trankynam.com/atext/downloads/aTextLegacy.dmg" - expectedTeamID="KHEMQ2FD9E" - ;; + # credit: Gabe Marchan (gabemarchan.com - @darklink87) + name="aText" + type="dmg" + downloadURL="https://trankynam.com/atext/downloads/aTextLegacy.dmg" + expectedTeamID="KHEMQ2FD9E" + ;; atom) name="Atom" type="zip" @@ -1825,13 +1844,29 @@ camostudio) # Camo Studio will ask for admin permissions to install som plug-ins. that has not been handled. expectedTeamID="Q248YREB53" ;; -camtasia) - name="Camtasia 2020" +camtasia|\ +camtasia2021) + name="Camtasia 2021" type="dmg" - downloadURL=https://download.techsmith.com/camtasiamac/releases/Camtasia.dmg + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2021" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; -canva) +camtasia2019) + name="Camtasia 2019" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2019" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; + camtasia2020) + name="Camtasia 2020" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2020" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; + canva) name="Canva" type="dmg" if [[ $(arch) == "arm64" ]]; then @@ -1861,7 +1896,7 @@ citrixworkspace) name="Citrix Workspace" type="pkgInDmg" downloadURL="https:"$(curl -s -L "https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html#ctx-dl-eula-external" | grep "dmg?" | sed "s/.*rel=.\(.*\)..id=.*/\1/") # http://downloads.citrix.com/18823/CitrixWorkspaceApp.dmg?__gda__=1605791892_edc6786a90eb5197fb226861a8e27aa8 - appNewVersion=$(curl -fs https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html | grep "

Version" | head -1 | cut -d " " -f1 | cut -d ";" -f2 | cut -d "." -f 1-3) + appNewVersion=$(curl -fs https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html | grep "

Version" | head -1 | awk '{print $2}' | cut -d "." -f 1-3) expectedTeamID="S272Y5R93J" ;; clevershare2) @@ -1899,6 +1934,24 @@ cloudya) appNewVersion="$(curl -fs https://www.nfon.com/de/service/downloads | grep -i -E -o "Cloudya Desktop App MAC [0-9.]*" | sed 's/^.*\ \([^ ]\{0,7\}\)$/\1/g')" expectedTeamID="X26F74J8TH" ;; +clue) + #For personal use and students + name="Clue" + type="dmg" + downloadURL=$(curl -fsL https://clue.no/en/download | grep "For personal use and students:" | sed 's/.*href="//' | sed 's/".*//') + appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\..*/\1/g')" + versionKey="CFBundleVersion" + expectedTeamID="3NX6B9TB2F" + ;; +cluefull) + #For companies and schools + name="Clue" + type="dmg" + downloadURL=$(curl -fsL https://clue.no/en/download | grep "For companies and schools:" | sed 's/.*href="//' | sed 's/".*//') + appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\F.*/\1/g')" + versionKey="CFBundleVersion" + expectedTeamID="3NX6B9TB2F" + ;; code42) name="Code42" type="pkgInDmg" @@ -1941,6 +1994,13 @@ craftmanager) appNewVersion="$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' 2>/dev/null | head -1 | cut -d '"' -f 2)" expectedTeamID="VRXQSNCL5W" ;; +craftmanagerforsketch) + name="CraftManager" + type="zip" + downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip" + appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2) + expectedTeamID="VRXQSNCL5W" + ;; cryptomator) name="Cryptomator" type="dmg" @@ -1980,7 +2040,13 @@ darktable) dbeaverce) name="DBeaver" type="dmg" - downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos.dmg" + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos-aarch64.dmg" + appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^location | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1)" + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos.dmg" + appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^location | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1)" + fi expectedTeamID="42B6MDKMW8" blockingProcesses=( dbeaver ) ;; @@ -2061,6 +2127,14 @@ diskspace) appNewVersion="$(versionFromGit scriptingosx diskspace)" expectedTeamID="JME5BW3F3R" ;; +displaylinkmanager) + name="DisplayLink Manager" + type="pkg" + #packageID="com.displaylink.displaylinkmanagerapp" + downloadURL=https://www.synaptics.com$(redirect=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep 'class="download-link">Download' | head -n 1 | sed 's/.*href="//' | sed 's/".*//') && curl -sfL "https://www.synaptics.com$redirect" | grep Accept | head -n 1 | sed 's/.*href="//' | sed 's/".*//') + appNewVersion=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep "Release:" | head -n 1 | cut -d ' ' -f2) + expectedTeamID="73YQY62QM3" + ;; docker) name="Docker" type="dmg" @@ -2082,6 +2156,15 @@ dockutil) expectedTeamID="Z5J8CJBUWC" blockingProcesses=( NONE ) ;; +drawio) + name="draw.io" + type="dmg" + archiveName="draw.io-universal-[0-9.]*.dmg" + downloadURL="$(downloadURLFromGit jgraph drawio-desktop)" + appNewVersion="$(versionFromGit jgraph drawio-desktop)" + expectedTeamID="UZEUFB4N53" + blockingProcesses=( draw.io ) + ;; drift) # credit Elena Ackley (@elenaelago) name="Drift" @@ -2093,8 +2176,19 @@ dropbox) name="Dropbox" type="dmg" downloadURL="https://www.dropbox.com/download?plat=mac&full=1" + appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | sed -E 's/.*%20([0-9.]*)\.dmg/\1/g') expectedTeamID="G7HH3F8CAK" ;; +duckduckgo) + name="DuckDuckGo" + type="dmg" + #downloadURL="https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo.dmg" + #downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2) + downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2) + #appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2) + appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/sparkle:shortVersionString)[1]' 2>/dev/null | cut -d ">" -f2 | cut -d "<" -f1) + expectedTeamID="HKE973VLUW" + ;; easeusdatarecoverywizard) # credit: Søren Theilgaard (@theilgaard) name="EaseUS Data Recovery Wizard" @@ -2118,6 +2212,15 @@ egnyte) expectedTeamID="FELUD555VC" blockingProcesses=( NONE ) ;; +egnytewebedit) + name="EgnyteWebEdit" + type="pkg" + downloadURL="https://egnyte-cdn.egnyte.com/webedit/mac/en-us/latest/EgnyteWebEdit.pkg" + expectedTeamID="FELUD555VC" + appName="Egnyte WebEdit.app" + blockingProcesses=( NONE ) + ;; + element) name="Element" type="dmg" @@ -2215,6 +2318,16 @@ figma) appNewVersion="$(curl -fsL https://desktop.figma.com/mac/RELEASE.json | awk -F '"' '{ print $8 }')" expectedTeamID="T8RA8NE3B7" ;; +filezilla) + name="FileZilla" + type="tbz" + packageID="org.filezilla-project.filezilla" + downloadURL=$(curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '"' '{print $2}' ) + appNewVersion=$( curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '_' '{print $2}' ) + expectedTeamID="5VPGKXL75N" + blockingProcesses=( NONE ) + ;; + findanyfile) name="Find Any File" type="zip" @@ -2229,6 +2342,7 @@ firefox) appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '/dev/null | cut -d '"' -f 2) - expectedTeamID="W8F64X92K3" - appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4) - appName="Grammarly Installer.app" - ;; + name="Grammarly Desktop" + type="dmg" + packageID="com.grammarly.ProjectLlama" + downloadURL=$(curl -fsL "https://download-mac.grammarly.com/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null | cut -d '"' -f 2) + expectedTeamID="W8F64X92K3" + appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4) + # appName="Grammarly Installer.app" + installerTool="Grammarly Installer.app" + CLIInstaller="Grammarly Installer.app/Contents/MacOS/Grammarly Desktop" +;; grandperspective) name="GrandPerspective" type="dmg" @@ -2529,6 +2696,15 @@ hpeasystart) downloadURL="https://ftp.hp.com/pub/softlib/software12/HP_Quick_Start/osx/Applications/HP_Easy_Start.app.zip" expectedTeamID="6HB5Y2QTA3" ;; +hype) + name="Hype4" + type="dmg" + packageID="com.tumult.Hype4" + downloadURL="https://static.tumult.com/hype/download/Hype.dmg" + appNewVersion=$( curl -fsL https://tumult.com/hype/download/all/ | grep Ongoing | awk -F '<' '{print $4}' | sed 's/[^0-9.]//g' ) + expectedTeamID="8J356DM772" + blockingProcesses=( NONE ) + ;; hyper) name="Hyper" type="dmg" @@ -2556,6 +2732,24 @@ icons) appNewVersion=$(versionFromGit sap macOS-icon-generator ) expectedTeamID="7R5ZEU67FQ" ;; +idrive) + name="IDrive" + type="pkgInDmg" + pkgName="IDrive.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*(https.*dmg).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*mac_vernum\=\"Version\ ([0-9.]*).*/\1/g') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; +idrivethin) + name="IDrive" + type="pkgInDmg" + pkgName="IDriveThin.pkg" + downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thinclient-mac([^;]*).*/\1/g' | sed -E 's/.*(https.*dmg).*/\1/g') + appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thin\_mac\_ver\=\"Version\ ([0-9.]*).*/\1/g') + versionKey="CFBundleVersion" + expectedTeamID="JWDCNYZ922" + ;; iina) name="IINA" type="dmg" @@ -2563,6 +2757,15 @@ iina) appNewVersion=$(versionFromGit iina iina ) expectedTeamID="67CQ77V27R" ;; +imageoptim) + name="imageoptim" + type="tbz" + packageID="net.pornel.ImageOptim" + downloadURL="https://imageoptim.com/ImageOptim.tbz2" + appNewVersion=$( curl -fsL https://imageoptim.com/appcast.xml | grep "title" | tail -n 1 | sed 's/[^0-9.]//g' ) + expectedTeamID="59KZTZA4XR" + blockingProcesses=( NONE ) + ;; imazingprofileeditor) # Credit: Bilal Habib @Pro4TLZZ name="iMazing Profile Editor" @@ -2897,8 +3100,24 @@ libreoffice) expectedTeamID="7P5S3ZLCN7" blockingProcesses=( soffice ) ;; +linear) + name="Linear" + type="dmg" + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://desktop.linear.app/mac/dmg/arm64" + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://desktop.linear.app/mac/dmg" + fi + appNewVersion=$(curl -sIkL $downloadURL | sed -r '/filename=/!d;s/.*filename=(.*)$/\1/' | awk '{print $2}') + expectedTeamID="7VZ2S3V9RV" + versionKey="CFBundleShortVersionString" + appName="Linear.app" + blockingProcesses=( "Linear" ) + ;; + +logioptions|\ logitechoptions) - name="Logitech Options" + name="Logi Options" type="pkgInZip" #downloadURL=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options/.*\.zip" | head -1) downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.zip" @@ -2979,6 +3198,14 @@ macfuse) appNewVersion=$(versionFromGit osxfuse osxfuse) expectedTeamID="3T5GSNBU6W" ;; +macoslaps) + name="macOSLAPS" + type="pkg" + packageID="edu.psu.macOSLAPS" + downloadURL="$(downloadURLFromGit joshua-d-miller macOSLAPS)" + appNewVersion="$(versionFromGit joshua-d-miller macOSLAPS)" + expectedTeamID="9UYK4F9BSM" + ;; macports) name="MacPorts" type="pkg" @@ -3320,6 +3547,20 @@ microsoftyammer) #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate --list; /Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate" #updateToolArguments=( --install --apps ?????? ) ;; +mightymike) + name="Mighty Mike" + type="dmg" + downloadURL=$(downloadURLFromGit jorio MightyMike) + appNewVersion=$(versionFromGit jorio MightyMike) + expectedTeamID="RVNL7XC27G" + ;; +mindmanager) + name="MindManager" + type="dmg" + downloadURL="https://www.mindmanager.com/mm-mac-dmg" + appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*_Mac_*([0-9.]*)\..*/\1/g')" + expectedTeamID="ZF6ZZ779N5" + ;; miro) # credit: @matins name="Miro" @@ -3607,7 +3848,12 @@ onionshare) onlyofficedesktop) name="ONLYOFFICE" type="dmg" - downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/distrib/onlyoffice/ONLYOFFICE.dmg" + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/arm/distrib/ONLYOFFICE.dmg" + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/x86_64/distrib/ONLYOFFICE.dmg" + fi + appNewVersion=$(versionFromGit ONLYOFFICE DesktopEditors) expectedTeamID="2WH24U26GJ" ;; openvpnconnect) @@ -3699,6 +3945,15 @@ perimeter81) appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //' | cut -d"." -f1-3)" expectedTeamID="924635PD62" ;; +pika) + name="Pika" + type="dmg" + packageID="com.superhighfives.Pika" + downloadURL=$(downloadURLFromGit "superhighfives" "pika") + appNewVersion=$(versionFromGit "superhighfives" "pika") + expectedTeamID="TGHU37N6EX" + blockingProcesses=( NONE ) + ;; pitch) name="Pitch" type="dmg" @@ -3726,11 +3981,15 @@ plisteditpro) expectedTeamID="8NQ43ND65V" ;; postman) - # credit: Mischa van der Bent 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:]\t]//g' ) + if [[ $(arch) == "arm64" ]]; then + downloadURL="https://dl.pstmn.io/download/latest/osx_arm64" + appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/') + elif [[ $(arch) == "i386" ]]; then + downloadURL="https://dl.pstmn.io/download/latest/osx_64" + appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/') + fi expectedTeamID="H7H8Q7M5CK" ;; prism9) @@ -3775,6 +4034,15 @@ promiseutilityr) downloadURL="https://www.promise.com/DownloadFile.aspx?DownloadFileUID=6533" expectedTeamID="268CCUR4WN" ;; +propresenter7) + name="ProPresenter 7" + appName="ProPresenter.app" + type="zip" + blockingProcesses="ProPresenter" + downloadURL=$(curl -s "https://api.renewedvision.com/v1/pro/upgrade?platform=macos&osVersion=12&appVersion=771&buildNumber=117899527&includeNotes=false" | grep -Eo '"downloadUrl":.*?[^\]",' | head -n 1 | cut -d \" -f 4 | sed -e 's/\\//g') + appNewVersion=$(curl -s "https://api.renewedvision.com/v1/pro/upgrade?platform=macos&osVersion=12&appVersion=771&buildNumber=117899527&includeNotes=false" | grep -Eo '"version":.*?[^\]",' | head -n 1 | cut -d \" -f 4) + expectedTeamID="97GAAZ6CPX" + ;; protonvpn) name="ProtonVPN" type="dmg" @@ -3796,6 +4064,13 @@ pymol) 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" ;; +qgis-pr) + name="QGIS" + type="dmg" + downloadURL="https://download.qgis.org/downloads/macos/qgis-macos-pr.dmg" + appNewVersion="$(curl -fs "https://www.qgis.org/da/_static/documentation_options.js" | grep -i version | cut -d "'" -f2)" + expectedTeamID="4F7N4UDA22" + ;; r) name="R" type="pkg" @@ -3811,10 +4086,15 @@ ramboxce) expectedTeamID="7F292FPD69" ;; rancherdesktop) - name="Rancher.Desktop-1.0.0-mac" + name="Rancher Desktop" type="zip" - archiveName="Rancher.Desktop-[0-9.]*-mac.zip" - downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)" + if [[ $(arch) == "arm64" ]]; then + archiveName="Rancher.Desktop-[0-9.]*-mac.aarch64.zip" + downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)" + elif [[ $(arch) == "i386" ]]; then + archiveName="Rancher.Desktop-[0-9.]*-mac.x86_64.zip" + downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)" + fi appNewVersion="$(versionFromGit rancher-sandbox rancher-desktop)" expectedTeamID="2Q6FHJR3H3" appName="Rancher Desktop.app" @@ -3837,14 +4117,15 @@ redeye) remotedesktopmanagerenterprise) name="Remote Desktop Manager" type="dmg" - downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1) + downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1) appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g') expectedTeamID="N592S9ASDB" + blockingProcesses=( "$name" ) ;; remotedesktopmanagerfree) name="Remote Desktop Manager Free" type="dmg" - downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1) + downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1) appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g') expectedTeamID="N592S9ASDB" ;; @@ -3885,11 +4166,15 @@ ricohpsprinters) ;; ringcentralapp) # credit: Isaac Ordonez, Mann consulting (@mannconsulting) - name="Glip" - type="dmg" - downloadURL="https://downloads.ringcentral.com/glip/rc/GlipForMac" + name="Ringcentral" + type="pkg" + if [[ $(arch) != "i386" ]]; then + downloadURL="https://app.ringcentral.com/download/RingCentral-arm64.pkg" + else + downloadURL="https://app.ringcentral.com/download/RingCentral.pkg" + fi expectedTeamID="M932RC5J66" - blockingProcesses=( "Glip" ) + blockingProcesses=( "Ringcentral" ) ;; ringcentralclassicapp) name="Glip" @@ -4019,6 +4304,13 @@ shield) appNewVersion=$(versionFromGit theevilbit Shield) expectedTeamID="33YRLYRBYV" ;; +shottr) + name="Shottr" + type="dmg" + downloadURL="https://shottr.cc/dl/Shottr-1.5.3.dmg" + appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' ) + expectedTeamID="2Y683PRQWN" + ;; sidekick) name="Sidekick" type="dmg" @@ -4060,7 +4352,7 @@ sizeup) sketch) name="Sketch" type="zip" - downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g') + downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | tr '"' "\n" | grep -E "https.*.zip") appNewVersion=$(curl -fs https://www.sketch.com/updates/ | grep "Sketch Version" | head -1 | sed -E 's/.*Version ([0-9.]*)<.*/\1/g') # version from update page expectedTeamID="WUGMZZ5K46" ;; @@ -4078,6 +4370,18 @@ skype) expectedTeamID="AL798K98FX" Company="Microsoft" ;; +slab) + name="Slab" + type="dmg" + if [[ $(arch) == i386 ]]; then + archiveName="Slab-[0-9.]*-darwin-x64.dmg" + elif [[ $(arch) == arm64 ]]; then + archiveName="Slab-[0-9.]*-darwin-arm64.dmg" + fi + downloadURL=$(downloadURLFromGit slab desktop-releases) + appNewVersion=$(versionFromGit slab desktop-releases) + expectedTeamID="Q67SW996Z5" + ;; slack) name="Slack" type="dmg" @@ -4097,11 +4401,32 @@ smartgit) expectedTeamID="PHMY45PTNW" ;; snagit|\ -snagit2021|\ -snagit2020) +snagit2022) + name="Snagit 2022" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2022" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2022" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; +snagit2019) + name="Snagit 2019" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2019" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; + snagit2020) + name="Snagit 2020" + type="dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2020" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') + expectedTeamID="7TQL462TU8" + ;; + snagit2021) name="Snagit 2021" type="dmg" - downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg" + downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2021" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; snapgeneviewer) @@ -4111,6 +4436,15 @@ snapgeneviewer) 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" ;; +sonobus) + name="Sonobus" + type="pkgInDmg" + html_page_source="$(curl -fs 'https://www.sonobus.net')" + downloadFile="$(echo "${html_page_source}" | xmllint --html --xpath "string(//a[contains(@href, 'mac.dmg')]/@href)" - 2> /dev/null)" + downloadURL="https://www.sonobus.net/$downloadFile" + appNewVersion="$(echo "${downloadFile}" | sed 's/releases\/sonobus-//' | sed 's/\-mac.dmg//' )" + expectedTeamID="XCS435894D" + ;; sonos|\ sonoss1) # credit: Erik Stam (@erikstam) @@ -4262,8 +4596,15 @@ tageditor) talkdeskcallbar) name="Callbar" type="dmg" - downloadURL=https://downloadcallbar.talkdesk.com/Callbar-$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version":"\([^"]*\)".*$/\1/p').dmg - appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version":"\([^"]*\)".*$/\1/p') + appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p') + downloadURL=https://downloadcallbar.talkdesk.com/Callbar-${appNewVersion}.dmg + expectedTeamID="YGGJX44TB8" + ;; +talkdeskcxcloud) + name="Talkdesk" + type="dmg" + appNewVersion=$(curl -fs https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-latest-metadata.json | sed -n -e 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p' | head -n 1) + downloadURL="https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-${appNewVersion}.dmg" expectedTeamID="YGGJX44TB8" ;; taskpaper) @@ -4357,6 +4698,31 @@ thunderbird) expectedTeamID="43AQ936H96" blockingProcesses=( thunderbird ) ;; +thunderbird_intl) + # This label will try to figure out the selected language of the user, + # and install corrosponding version of Thunderbird + name="Thunderbird" + type="dmg" + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-') + printlog "Found language $userLanguage to be used for $name." + releaseURL="https://ftp.mozilla.org/pub/thunderbird/releases/latest/README.txt" + until curl -fs $releaseURL | grep -q "=$userLanguage"; do + if [ ${#userLanguage} -eq 2 ]; then + break + fi + printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'" + userLanguage=${userLanguage:0:2} + done + printlog "Using language '$userLanguage' for download." + downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx&lang=$userLanguage" + if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then + printlog "Download not found for '$userLanguage', using default ('en-US')." + downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx" + fi + appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}') + expectedTeamID="43AQ936H96" + blockingProcesses=( thunderbird ) + ;; tidal) name="TIDAL" type="dmg" @@ -4415,6 +4781,14 @@ typora) appNewVersion=$(curl -fs "https://www.typora.io/download/dev_update.xml" | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' 2>/dev/null | cut -d '"' -f2) expectedTeamID="9HWK5273G4" ;; +ultimakercura) + name="Ultimaker Cura" + type="dmg" + downloadURL="$(downloadURLFromGit Ultimaker Cura)" + archiveName="Ultimaker_Cura-[0-9].*-Darwin.dmg" + appNewVersion=$(versionFromGit Ultimaker Cura ) + expectedTeamID="V4B3JXRRQS" + ;; umbrellaroamingclient) # credit: Tadayuki Onishi (@kenchan0130) name="Umbrella Roaming Client" @@ -4436,6 +4810,14 @@ universaltypeclient) 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" ;; +unnaturalscrollwheels) + name="UnnaturalScrollWheels" + type="dmg" + downloadURL="$(downloadURLFromGit ther0n UnnaturalScrollWheels)" + appNewVersion="$(versionFromGit ther0n UnnaturalScrollWheels)" + expectedTeamID="D6H5W2T379" + blockingProcesses=( UnnaturalScrollWheels ) + ;; utm) name="UTM" type="dmg" @@ -4563,6 +4945,12 @@ webexmeetings) #blockingProcessesMaxCPU="5" blockingProcesses=( Webex ) ;; +wechat) + name="WeChat" + type="dmg" + downloadURL="https://dldir1.qq.com/weixin/mac/WeChatMac.dmg" + expectedTeamID="5A4RE8SF68" + ;; whatsapp) name="WhatsApp" type="dmg" @@ -4618,6 +5006,15 @@ xeroxphaser7800) 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" ;; +xeroxworkcentre7800) + name="XeroxWorkCentre" + type="pkgInDmg" + appCustomVersion(){ lpinfo -m | grep 783 | tail -n 1 | awk -F ', ' '{print $2}' } + appNewVersion=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | grep .dmg | head -n 1 | awk -F '_' '{print $2}' ) + downloadURL=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | xmllint --html --format - 2>/dev/null | grep -o "https://.*XeroxDrivers.*.dmg" ) + expectedTeamID="G59Y3XFNFR" + blockingProcesses=( NONE ) +;; xink) name="Xink" type="pkg" @@ -4682,6 +5079,14 @@ zohoworkdrive) downloadURL=$(echo "$lines" | grep -i "files-accl.zohopublic.com")$(echo "$lines" | grep -i -A17 "files-accl.zohopublic.com" | grep -i -A2 macintosh | tail -1) expectedTeamID="TZ824L8Y37" ;; +zohoworkdrivegenie) + name="Zoho WorkDrive Genie" + type="dmg" + # https://www.zoho.com/workdrive/genie.html + downloadURL="https://www.zoho.com/workdrive/downloads/edit-tool/Zoho_WorkDrive_Genie.dmg" + CLIInstaller="Zoho WorkDrive Genie.app/Contents/MacOS/Zoho WorkDrive Genie" + expectedTeamID="TZ824L8Y37" + ;; zohoworkdrivetruesync) # Using this label expects you to agree to these: # License Areemant: https://www.zoho.com/workdrive/zohoworkdrive-license-agreement.html diff --git a/Labels.txt b/Labels.txt index 96652a8..cabdcf4 100644 --- a/Labels.txt +++ b/Labels.txt @@ -21,6 +21,7 @@ amazonchime amazoncorretto8jdk amazonworkspaces androidfiletransfer +androidstudio anydesk apparency appcleaner @@ -34,6 +35,7 @@ aquaskk arq7 asana atext +atextlegacy atom audacity authydesktop @@ -65,6 +67,8 @@ calcservice calibre camostudio camtasia +camtasia2019 +camtasia2021 canva chatwork cisdem-documentreader @@ -74,11 +78,14 @@ clickshare clipy closeio cloudya +clue +cluefull code42 coderunner colourcontrastanalyser cormorant craftmanager +craftmanagerforsketch cryptomator cyberduck daisydisk @@ -95,13 +102,17 @@ dialog dialpad discord diskspace +displaylinkmanager docker dockutil +drawio drift dropbox +duckduckgo easeusdatarecoverywizard easyfind egnyte +egnytewebedit element eraseinstall eshareosx @@ -114,6 +125,7 @@ fastscripts favro ferdi figma +filezilla findanyfile firefox firefox_da @@ -122,8 +134,11 @@ firefoxesr firefoxesr_intl firefoxesrpkg firefoxpkg +firefoxpkg_intl flowjo flux +flycut +fontexplorer front fsmonitor gimp @@ -151,10 +166,14 @@ hazel houdahspot hpeasyadmin hpeasystart +hype hyper ibarcoder icons +idrive +idrivethin iina +imageoptim imazingprofileeditor inkscape insomnia @@ -193,6 +212,8 @@ lastpass launchbar lexarrecoverytool libreoffice +linear +logioptions logitechoptions logseq loom @@ -202,6 +223,7 @@ lulu macadminspython maccyapp macfuse +macoslaps macports malwarebytes marathon @@ -233,6 +255,8 @@ microsoftteams microsoftvisualstudiocode microsoftword microsoftyammer +mightymike +mindmanager miro mobikinassistantforandroid mochakeyboard @@ -277,6 +301,7 @@ paretosecurity parsec pdfsam perimeter81 +pika pitch plantronicshub platypus @@ -288,10 +313,12 @@ privileges proctortrack promiseutility promiseutilityr +propresenter7 protonvpn proxyman pycharmce pymol +qgis-pr r ramboxce rancherdesktop @@ -332,12 +359,16 @@ sizeup sketch sketchupviewer skype +slab slack smartgit snagit +snagit2019 snagit2020 snagit2021 +snagit2022 snapgeneviewer +sonobus sonos sonoss1 sonoss2 @@ -360,6 +391,7 @@ tableaupublic tableaureader tageditor talkdeskcallbar +talkdeskcxcloud taskpaper teamviewer teamviewerhost @@ -372,6 +404,7 @@ textmate theunarchiver things thunderbird +thunderbird_intl tidal toggltrack tom4aconverter @@ -380,9 +413,11 @@ trex tunnelbear tunnelblick typora +ultimakercura umbrellaroamingclient uniconverter universaltypeclient +unnaturalscrollwheels utm vagrant vanilla @@ -400,6 +435,7 @@ wallyezflash webex webexmeetings webexteams +wechat whatsapp wickrme wickrpro @@ -407,6 +443,7 @@ wireshark wordservice wwdc xeroxphaser7800 +xeroxworkcentre7800 xink xmenu xquartz @@ -415,6 +452,7 @@ yubikeymanagerqt zappy zeplin zohoworkdrive +zohoworkdrivegenie zohoworkdrivetruesync zoom zoomclient diff --git a/fragments/labels/1password8.sh b/fragments/labels/1password8.sh index 8ca3e78..c426113 100644 --- a/fragments/labels/1password8.sh +++ b/fragments/labels/1password8.sh @@ -12,4 +12,4 @@ expectedTeamID="2BUA8C4S2C" blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" ) #forcefulQuit=YES - ;; \ No newline at end of file + ;; diff --git a/fragments/labels/amazoncorretto8jdk.sh b/fragments/labels/amazoncorretto8jdk.sh index 48d6b5e..38696f6 100644 --- a/fragments/labels/amazoncorretto8jdk.sh +++ b/fragments/labels/amazoncorretto8jdk.sh @@ -9,4 +9,4 @@ type="pkg" appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}') fi expectedTeamID="94KV3E626L" -;; \ No newline at end of file +;; diff --git a/fragments/labels/androidstudio.sh b/fragments/labels/androidstudio.sh index 2fe2307..b016f65 100644 --- a/fragments/labels/androidstudio.sh +++ b/fragments/labels/androidstudio.sh @@ -10,4 +10,4 @@ androidstudio) fi expectedTeamID="EQHXZ8M8AV" blockingProcesses=( androidstudio ) - ;; \ No newline at end of file + ;; diff --git a/fragments/labels/camtasia2020.sh b/fragments/labels/camtasia2020.sh index 9f2bea3..8dba168 100644 --- a/fragments/labels/camtasia2020.sh +++ b/fragments/labels/camtasia2020.sh @@ -5,4 +5,3 @@ camtasia2020) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2020" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - \ No newline at end of file diff --git a/fragments/labels/postman.sh b/fragments/labels/postman.sh index 4fc3285..e59860c 100644 --- a/fragments/labels/postman.sh +++ b/fragments/labels/postman.sh @@ -9,4 +9,4 @@ postman) appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/') fi expectedTeamID="H7H8Q7M5CK" - ;; \ No newline at end of file + ;; diff --git a/fragments/labels/propresenter7.sh b/fragments/labels/propresenter7.sh index 786ce0b..56a366c 100644 --- a/fragments/labels/propresenter7.sh +++ b/fragments/labels/propresenter7.sh @@ -6,4 +6,4 @@ propresenter7) downloadURL=$(curl -s "https://api.renewedvision.com/v1/pro/upgrade?platform=macos&osVersion=12&appVersion=771&buildNumber=117899527&includeNotes=false" | grep -Eo '"downloadUrl":.*?[^\]",' | head -n 1 | cut -d \" -f 4 | sed -e 's/\\//g') appNewVersion=$(curl -s "https://api.renewedvision.com/v1/pro/upgrade?platform=macos&osVersion=12&appVersion=771&buildNumber=117899527&includeNotes=false" | grep -Eo '"version":.*?[^\]",' | head -n 1 | cut -d \" -f 4) expectedTeamID="97GAAZ6CPX" - ;; \ No newline at end of file + ;; diff --git a/fragments/labels/snagit2019.sh b/fragments/labels/snagit2019.sh index 2133138..baab34f 100644 --- a/fragments/labels/snagit2019.sh +++ b/fragments/labels/snagit2019.sh @@ -5,4 +5,3 @@ snagit2019) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2019" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - \ No newline at end of file diff --git a/fragments/labels/snagit2020.sh b/fragments/labels/snagit2020.sh index eb03c39..7a92964 100644 --- a/fragments/labels/snagit2020.sh +++ b/fragments/labels/snagit2020.sh @@ -5,4 +5,3 @@ snagit2020) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2020" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - \ No newline at end of file diff --git a/fragments/labels/sonobus.sh b/fragments/labels/sonobus.sh index 0aa9d9a..a5f9508 100644 --- a/fragments/labels/sonobus.sh +++ b/fragments/labels/sonobus.sh @@ -1,9 +1,9 @@ sonobus) -name="Sonobus" -type="pkgInDmg" -html_page_source="$(curl -fs 'https://www.sonobus.net')" -downloadFile="$(echo "${html_page_source}" | xmllint --html --xpath "string(//a[contains(@href, 'mac.dmg')]/@href)" - 2> /dev/null)" -downloadURL="https://www.sonobus.net/$downloadFile" -appNewVersion="$(echo "${downloadFile}" | sed 's/releases\/sonobus-//' | sed 's/\-mac.dmg//' )" -expectedTeamID="XCS435894D" -;; \ No newline at end of file + name="Sonobus" + type="pkgInDmg" + html_page_source="$(curl -fs 'https://www.sonobus.net')" + downloadFile="$(echo "${html_page_source}" | xmllint --html --xpath "string(//a[contains(@href, 'mac.dmg')]/@href)" - 2> /dev/null)" + downloadURL="https://www.sonobus.net/$downloadFile" + appNewVersion="$(echo "${downloadFile}" | sed 's/releases\/sonobus-//' | sed 's/\-mac.dmg//' )" + expectedTeamID="XCS435894D" + ;; diff --git a/fragments/labels/UltimakerCura.sh b/fragments/labels/ultimakercura.sh similarity index 100% rename from fragments/labels/UltimakerCura.sh rename to fragments/labels/ultimakercura.sh diff --git a/fragments/labels/unnaturalscrollwheels.sh b/fragments/labels/unnaturalscrollwheels.sh index 18608ef..35cfea0 100644 --- a/fragments/labels/unnaturalscrollwheels.sh +++ b/fragments/labels/unnaturalscrollwheels.sh @@ -5,4 +5,4 @@ unnaturalscrollwheels) appNewVersion="$(versionFromGit ther0n UnnaturalScrollWheels)" expectedTeamID="D6H5W2T379" blockingProcesses=( UnnaturalScrollWheels ) - ;; \ No newline at end of file + ;; diff --git a/fragments/version.sh b/fragments/version.sh index c1d513b..1a2c355 100644 --- a/fragments/version.sh +++ b/fragments/version.sh @@ -1 +1 @@ -9.2beta +9.2 From fa5f052d5a33bfa751fb572c58b174ef7bd1fc74 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Mon, 16 May 2022 20:14:32 +0200 Subject: [PATCH 91/91] updated changelog --- CHANGELOG.md | 8 ++------ Installomator.sh | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2abbe4b..d927514 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - documentation updates (#485, #494) - new labels: - 1password8 (#514) - - UltimakerCura + - ultimakercura - androidstudio (#547) - atextlegacy (#464) - camtasia2019, camtasia2020 (#499) @@ -47,11 +47,7 @@ - citrixworkspace (#508) - dbeaverce (#450) - dropbox - - firefox - - firefox_da - - firefox_intl (#495) - - firefoxesr_intl (#496) - - firefoxpkg + - firefox, firefox_da, firefox_intl (#495), firefoxesr_intl (#496), firefoxpkg - googlechrome, googlechromepkg (#484) - gpgsuite (#465) - grammarly (#515) diff --git a/Installomator.sh b/Installomator.sh index 8a70fb1..4d9f31a 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1866,7 +1866,7 @@ camtasia2019) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2020" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - canva) +canva) name="Canva" type="dmg" if [[ $(arch) == "arm64" ]]; then @@ -4415,14 +4415,14 @@ snagit2019) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2019" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - snagit2020) +snagit2020) name="Snagit 2020" type="dmg" downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Snagit (Mac) 2020" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - snagit2021) +snagit2021) name="Snagit 2021" type="dmg" downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)