diff --git a/Installomator.sh b/Installomator.sh index e63b8d6..46dcf3a 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -1423,11 +1423,59 @@ firefox_da) expectedTeamID="43AQ936H96" 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) + printlog "Found language $userLanguage to be used for Firefox." + if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then + userLanguage=$(echo $userLanguage | cut -c 1-2) + if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then + userLanguage="en_US" + fi + fi + printlog "Using language $userLanguage for download." + downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=$userLanguage" + if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then + printlog "Download not found for that language. Using en-US" + downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US" + fi + appNewVersion=$(/usr/bin/curl -sl https://www.mozilla.org/en-US/firefox/releases/ | /usr/bin/grep '([0-9.]*) .*/\1/g' ) expectedTeamID="6N38VWS5BX" ;; +textexpander) + name="TextExpander" + type="zip" + downloadURL="https://textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx" + appNewVersion=$( curl -fsIL "https://textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx" | grep -i "^location" | awk '{print $2}' | tail -1 | cut -d "_" -f2 | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p' ) + expectedTeamID="7PKJ6G4DXL" + ;; textmate) name="TextMate" type="tbz" @@ -2500,6 +2566,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" @@ -2535,6 +2609,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" @@ -2698,6 +2780,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" diff --git a/Labels.txt b/Labels.txt index 8955d9e..46f9f2d 100644 --- a/Labels.txt +++ b/Labels.txt @@ -70,7 +70,9 @@ ferdi figma firefox firefox_da +firefox_intl firefoxesr +firefoxesr_intl firefoxesrpkg firefoxpkg front @@ -225,6 +227,7 @@ sonoss2 sourcetree spotify sublimetext +supportapp suspiciouspackage swiftruntimeforcommandlinetools tableaureader @@ -234,16 +237,17 @@ teamviewerhost teamviewerqs telegram textmate +theunarchiver things thunderbird tigervnc toggltrack torbrowser +trex tunnelbear tunnelblick umbrellaroamingclient universaltypeclient -universaltypeclient vagrant vanilla veracrypt @@ -260,6 +264,7 @@ whatsapp wickrme wickrpro wireshark +wwdc xeroxphaser7800 xink yubikeymanagerqt