From dfe0fbd58f0e17742eaca17c25bed41abba777e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 12 May 2021 11:41:05 +0200 Subject: [PATCH 01/12] trex --- Installomator.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Installomator.sh b/Installomator.sh index 138b204..82870ae 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -2458,6 +2458,14 @@ torbrowser) appNewVersion=$(curl -fs https://www.torproject.org/download/ | grep "downloadLink" | grep dmg | head -1 | cut -d '"' -f 4 | cut -d / -f 4) expectedTeamID="MADPSAYN6T" ;; +trex) + # credit: Søren Theilgaard (@theilgaard) + name="TRex" + type="zip" + downloadURL=$(downloadURLFromGit amebalabs TRex) + appNewVersion=$(versionFromGit amebalabs TRex) + expectedTeamID="X93LWC49WV" + ;; tunnelbear) name="TunnelBear" type="zip" From 33be8b0556c5b248ad2333c1598f0d9765d35215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 12 May 2021 12:08:26 +0200 Subject: [PATCH 02/12] supportapp --- Installomator.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Installomator.sh b/Installomator.sh index 82870ae..6a84def 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -2351,6 +2351,15 @@ sublimetext) #appNewVersion=$(curl -Is https://download.sublimetext.com/latest/stable/osx | grep "Location:" | sed -n -e 's/^.*Sublime Text //p' | sed 's/.dmg//g' | sed $'s/[^[:print:]\t]//g') # Alternative from @Oh4sh0 expectedTeamID="Z6D26JE4Y4" ;; +supportapp) + # credit: Søren Theilgaard (@theilgaard) + name="SupportApp" + type="pkg" + packageID="nl.root3.support" + downloadURL=$(downloadURLFromGit root3nl SupportApp) + appNewVersion=$(versionFromGit root3nl SupportApp) + expectedTeamID="98LJ4XBGYK" + ;; suspiciouspackage) # credit: Mischa van der Bent (@mischavdbent) name="Suspicious Package" From 2fbe9e810fb1f3ae9909fba04e10fc8b76b172b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Wed, 12 May 2021 13:18:59 +0200 Subject: [PATCH 03/12] nextcloud --- Installomator.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Installomator.sh b/Installomator.sh index 6a84def..f22b4b8 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1861,10 +1861,11 @@ nextcloud) type="pkg" #packageID="com.nextcloud.desktopclient" downloadURL=$(downloadURLFromGit nextcloud desktop) - #appNewVersion=$(versionFromGit nextcloud desktop) + appNewVersion=$(versionFromGit nextcloud desktop) # The version of the app is not equal to the version listed on GitHub. # App version something like "3.1.3git (build 4850)" but web page lists as "3.1.3" # Also it does not math packageID version "3.1.34850" + appCustomVersion(){defaults read /Applications/nextcloud.app/Contents/Info.plist CFBundleShortVersionString | sed -E 's/^([0-9.]*)git.*/\1/g'} expectedTeamID="NKUJUXUJ3B" ;; nomad) From fbd029d58dd453ea674b783ce90dc2fc17405712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 17 May 2021 10:53:57 +0200 Subject: [PATCH 04/12] supportapp --- Installomator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installomator.sh b/Installomator.sh index f22b4b8..e33228d 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -2354,7 +2354,7 @@ sublimetext) ;; supportapp) # credit: Søren Theilgaard (@theilgaard) - name="SupportApp" + name="Support" type="pkg" packageID="nl.root3.support" downloadURL=$(downloadURLFromGit root3nl SupportApp) From 631c7c2b91d7a0778987c9789d502c9a4cd3a1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 17 May 2021 13:48:44 +0200 Subject: [PATCH 05/12] wireshark missing space Probably cosmetic, but added a space character in `awk` part of `appNewVersion`. --- Installomator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installomator.sh b/Installomator.sh index e33228d..0642603 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -2636,7 +2636,7 @@ wireshark) name="Wireshark" type="dmg" downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Intel%2064.dmg" - appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F'[()]' '{print $2}') + appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F '[()]' '{print $2}') expectedTeamID="7Z6EMTD2C6" ;; xink) From 438214a5ecf9ecfa9dcce74889a71b1f7497d40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 17 May 2021 14:07:10 +0200 Subject: [PATCH 06/12] wwdc label New label --- Installomator.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Installomator.sh b/Installomator.sh index 0642603..c08d85d 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -2639,6 +2639,14 @@ wireshark) appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F '[()]' '{print $2}') expectedTeamID="7Z6EMTD2C6" ;; +wwdc) + # credit: Søren Theilgaard (@theilgaard) + name="WWDC" + type="dmg" + downloadURL=$(downloadURLFromGit insidegui WWDC) + appNewVersion=$(versionFromGit insidegui WWDC) + expectedTeamID="8C7439RJLG" + ;; xink) name="Xink" type="zip" From b17f1550b2be5c97028e7624e08fe40ee7379244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 17 May 2021 14:45:03 +0200 Subject: [PATCH 07/12] Update Labels.txt --- Labels.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Labels.txt b/Labels.txt index da6bf23..8725ca3 100644 --- a/Labels.txt +++ b/Labels.txt @@ -14,6 +14,10 @@ amazonworkspaces androidfiletransfer apparency appcleaner +applenyfonts +applesfcompact +applesfmono +applesfpro aquaskk atom autodmg @@ -36,6 +40,7 @@ camostudio camtasia citrixworkspace clevershare2 +clickshare code42 coderunner cormorant @@ -218,6 +223,7 @@ sonoss2 sourcetree spotify sublimetext +supportapp suspiciouspackage swiftruntimeforcommandlinetools tableaureader @@ -232,11 +238,11 @@ thunderbird tigervnc toggltrack torbrowser +trex tunnelbear tunnelblick umbrellaroamingclient universaltypeclient -universaltypeclient vagrant vanilla veracrypt @@ -253,6 +259,7 @@ whatsapp wickrme wickrpro wireshark +wwdc xeroxphaser7800 xink yubikeymanagerqt From b0dd72c9dd2e07b0cc66543697c2cf4fc7e59edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 17 May 2021 16:29:20 +0200 Subject: [PATCH 08/12] firefox intl 2 new labels that should figure out the language used by the user, and then install the Firefox version with that language. --- Installomator.sh | 36 ++++++++++++++++++++++++++++++++++++ Labels.txt | 7 ++----- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/Installomator.sh b/Installomator.sh index c08d85d..7032c1c 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1355,11 +1355,47 @@ firefox_da) expectedTeamID="43AQ936H96" blockingProcesses=( firefox ) ;; +firefox_intl) + name="Firefox" + type="dmg" + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | cut -c 1-2) + printlog "Found language $userLanguage to be used for Firefox." + if [[ "$userLanguage" == "en" ]]; then + userLanguage="en_US" + fi + downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=$userLanguage" + if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then + printlog "Download not found for that language. Using en-US" + downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US" + fi + appNewVersion=$(/usr/bin/curl -sl https://www.mozilla.org/en-US/firefox/releases/ | /usr/bin/grep ' Date: Mon, 17 May 2021 16:33:49 +0200 Subject: [PATCH 09/12] Update Installomator.sh --- Installomator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installomator.sh b/Installomator.sh index 7032c1c..c081524 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1383,7 +1383,7 @@ firefoxesrpkg) ;; firefoxesr_intl) name="Firefox" - type="pkg" + type="dmg" userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | cut -c 1-2) printlog "Found language $userLanguage to be used for Firefox." if [[ "$userLanguage" == "en" ]]; then From 8accb60ab2d1552ea41c8e63a95e5c399e5e325c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 18 May 2021 20:14:29 +0200 Subject: [PATCH 10/12] firefox intl version fixes --- Installomator.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Installomator.sh b/Installomator.sh index c081524..6450407 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1358,11 +1358,15 @@ firefox_da) firefox_intl) name="Firefox" type="dmg" - userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | cut -c 1-2) + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale) printlog "Found language $userLanguage to be used for Firefox." - if [[ "$userLanguage" == "en" ]]; then - userLanguage="en_US" + if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then + userLanguage=$(echo $userLanguage | cut -c 1-2) + if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then + userLanguage="en_US" + fi fi + printlog "Using language $userLanguage for download." downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=$userLanguage" if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then printlog "Download not found for that language. Using en-US" @@ -1384,11 +1388,15 @@ firefoxesrpkg) firefoxesr_intl) name="Firefox" type="dmg" - userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | cut -c 1-2) + userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale) printlog "Found language $userLanguage to be used for Firefox." - if [[ "$userLanguage" == "en" ]]; then - userLanguage="en_US" + 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" + fi fi + 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 From 88bcc87fd73dad34932a3dcd999c21ad9183ee68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 18 May 2021 20:57:27 +0200 Subject: [PATCH 11/12] Firefox intl explained --- Installomator.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Installomator.sh b/Installomator.sh index 6450407..399a7c5 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1356,6 +1356,8 @@ firefox_da) blockingProcesses=( firefox ) ;; firefox_intl) + # This label will try to figure out the selected language of the user, + # and install corrosponding version of Firefox name="Firefox" type="dmg" userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale) @@ -1386,6 +1388,8 @@ firefoxesrpkg) blockingProcesses=( firefox ) ;; firefoxesr_intl) + # 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) From 55cd237b980725f7fb6657066128579857f13ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Thu, 20 May 2021 11:46:50 +0200 Subject: [PATCH 12/12] theunarchiver label --- Installomator.sh | 8 ++++++++ Labels.txt | 1 + 2 files changed, 9 insertions(+) diff --git a/Installomator.sh b/Installomator.sh index 399a7c5..51e160b 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -2481,6 +2481,14 @@ textmate) appNewVersion=$(versionFromGit "textmate" "textmate") expectedTeamID="45TL96F76G" ;; +theunarchiver) + name="The Unarchiver" + type="dmg" + downloadURL="https://dl.devmate.com/com.macpaw.site.theunarchiver/TheUnarchiver.dmg" + #appNewVersion="" + expectedTeamID="S8EX82NJP6" + appName="The Unarchiver.app" + ;; things) name="Things" type="zip" diff --git a/Labels.txt b/Labels.txt index ecc8973..e4fb8e1 100644 --- a/Labels.txt +++ b/Labels.txt @@ -230,6 +230,7 @@ teamviewerhost teamviewerqs telegram textmate +theunarchiver things thunderbird tigervnc