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] 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