From 6e76685721e714063d1eeb145e50cc637c4e6095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Thu, 20 Jan 2022 14:18:27 +0100 Subject: [PATCH 1/3] Android file transfer --- fragments/labels/androidfiletransfer.sh | 1 - fragments/labels/mobikinassistantforandroid.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 fragments/labels/mobikinassistantforandroid.sh diff --git a/fragments/labels/androidfiletransfer.sh b/fragments/labels/androidfiletransfer.sh index 01a32d8..52d14ac 100644 --- a/fragments/labels/androidfiletransfer.sh +++ b/fragments/labels/androidfiletransfer.sh @@ -1,5 +1,4 @@ androidfiletransfer) - #credit: Sam Ess (saess-sep) name="Android File Transfer" type="dmg" downloadURL="https://dl.google.com/dl/androidjumper/mtp/current/AndroidFileTransfer.dmg" diff --git a/fragments/labels/mobikinassistantforandroid.sh b/fragments/labels/mobikinassistantforandroid.sh new file mode 100644 index 0000000..3208a4d --- /dev/null +++ b/fragments/labels/mobikinassistantforandroid.sh @@ -0,0 +1,8 @@ +mobikinassistantforandroid) + name="MobiKin Assistant for Android" + type="dmg" + downloadURL="https://www.mobikin.com/downloads/mobikin-android-assistant.dmg" + versionKey="CFBundleVersion" + appNewVersion=$(curl -fs https://www.mobikin.com/assistant-for-android-mac/ | grep -i "version:" | sed -E 's/.*Version: ([0-9.]*)<.*/\1/g') + expectedTeamID="YNL42PA5C4" + ;; From 9bd11b68267379f8e8e1a7b274c5dc45fb6de2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Thu, 20 Jan 2022 14:36:51 +0100 Subject: [PATCH 2/3] wireshark version update --- fragments/labels/wireshark.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/wireshark.sh b/fragments/labels/wireshark.sh index 19725b8..d293dd8 100644 --- a/fragments/labels/wireshark.sh +++ b/fragments/labels/wireshark.sh @@ -6,6 +6,6 @@ wireshark) elif [[ $(arch) == arm64 ]]; then downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Arm%2064.dmg" fi - appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F '[()]' '{print $2}') + appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep -i "href.*_stable" | sed -E 's/.*\(([0-9.]*)\).*/\1/g') expectedTeamID="7Z6EMTD2C6" ;; From ac9c5096cde1a66a503248fcf8b1fa83b48146d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Sun, 30 Jan 2022 11:18:22 +0100 Subject: [PATCH 3/3] Update canva.sh Results: ``` checkLabels.sh canva Total labels: canva Architecture: i386 ########## canva Name: Canva Download URL: https://desktop-release.canva.com/Canva-latest.dmg Type: dmg Version: 1.38.0 OK: downloadURL works OK OK: download extension MATCH on dmg Architecture: arm64 ########## canva Name: Canva Download URL: https://desktop-release.canva.com/Canva-latest-arm64.dmg Type: dmg Version: 1.38.0 OK: downloadURL works OK OK: download extension MATCH on dmg Warnings counted: 0 ERRORS counted: 0 Done! assemble.sh canva 2022-01-30 11:16:01 canva ################## Start Installomator v. 9.0dev 2022-01-30 11:16:01 canva ################## canva 2022-01-30 11:16:01 canva DEBUG mode 1 enabled. 2022-01-30 11:16:02 canva BLOCKING_PROCESS_ACTION=tell_user 2022-01-30 11:16:02 canva NOTIFY=success 2022-01-30 11:16:02 canva LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-01-30 11:16:02 canva no blocking processes defined, using Canva as default 2022-01-30 11:16:02 canva Changing directory to /Users/st/Documents/GitHub/Installomator/build 2022-01-30 11:16:02 canva App(s) found: /Applications/Canva.app 2022-01-30 11:16:02 canva found app at /Applications/Canva.app, version 1.38.0 2022-01-30 11:16:02 canva appversion: 1.38.0 2022-01-30 11:16:02 canva Latest version of Canva is 1.38.0 2022-01-30 11:16:02 canva DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-01-30 11:16:02 canva Downloading https://desktop-release.canva.com/Canva-latest-arm64.dmg to Canva.dmg 2022-01-30 11:16:10 canva DEBUG mode 1, not checking for blocking processes 2022-01-30 11:16:10 canva Installing Canva 2022-01-30 11:16:10 canva Mounting /Users/st/Documents/GitHub/Installomator/build/Canva.dmg 2022-01-30 11:16:15 canva Mounted: /Volumes/Canva 1.38.0-arm64 1 2022-01-30 11:16:15 canva Verifying: /Volumes/Canva 1.38.0-arm64 1/Canva.app 2022-01-30 11:16:17 canva Team ID matching: 5HD2ARTBFS (expected: 5HD2ARTBFS ) 2022-01-30 11:16:17 canva Downloaded version of Canva is 1.38.0, same as installed. 2022-01-30 11:16:17 canva Unmounting /Volumes/Canva 1.38.0-arm64 1 "disk6" ejected. 2022-01-30 11:16:17 canva DEBUG mode 1, not reopening anything 2022-01-30 11:16:17 canva ################## End Installomator, exit code 0 ``` --- fragments/labels/canva.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fragments/labels/canva.sh b/fragments/labels/canva.sh index f399d77..c64e290 100644 --- a/fragments/labels/canva.sh +++ b/fragments/labels/canva.sh @@ -2,10 +2,11 @@ canva) name="Canva" type="dmg" if [[ $(arch) == "arm64" ]]; then - downloadURL=$(curl -fsLI -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "accept-encoding: gzip, deflate, br" -H "accept-language: en-US,en;q=0.9" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "sec-fetch-mode: navigate" -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" "https://www.canva.com/download/mac/arm/canva-desktop/" | grep -i "^location" | cut -d " " -f2 | tr -d '\r') + downloadURL=https://desktop-release.canva.com/Canva-latest-arm64.dmg + appNewVersion=$( curl -fsLI -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "accept-encoding: gzip, deflate, br" -H "accept-language: en-US,en;q=0.9" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "sec-fetch-mode: navigate" -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" "https://www.canva.com/download/mac/arm/canva-desktop/" | grep -i "^location" | cut -d " " -f2 | tr -d '\r' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-*.*\.dmg/\1/g' ) elif [[ $(arch) == "i386" ]]; then - downloadURL=$(curl -fsLI -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" -H "accept-encoding: gzip, deflate, br" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "accept-language: en-US,en;q=0.9" -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "sec-fetch-mode: navigate" "https://www.canva.com/download/mac/intel/canva-desktop/" | grep -i "^location" | cut -d " " -f2 | tr -d '\r') + downloadURL=https://desktop-release.canva.com/Canva-latest.dmg + appNewVersion=$( curl -fsLI -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" -H "accept-encoding: gzip, deflate, br" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "accept-language: en-US,en;q=0.9" -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "sec-fetch-mode: navigate" "https://www.canva.com/download/mac/intel/canva-desktop/" | grep -i "^location" | cut -d " " -f2 | tr -d '\r' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-*.*\.dmg/\1/g' ) fi - appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' ) expectedTeamID="5HD2ARTBFS" ;;