mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-20 21:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

firefox intl version fixes

Browse Source
This commit is contained in:
Søren Theilgaard
2021-05-18 20:14:29 +02:00
parent 969d434503
commit 8accb60ab2
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Installomator.sh
View File

@@ -1358,11 +1358,15 @@ firefox_da)
firefox_intl) firefox_intl)
name="Firefox" name="Firefox"
type="dmg" 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." printlog "Found language $userLanguage to be used for Firefox."
if [[ "$userLanguage" == "en" ]]; then if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
userLanguage="en_US" 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 fi
printlog "Using language $userLanguage for download."
downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=$userLanguage" downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=$userLanguage"
if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then 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"
@@ -1384,11 +1388,15 @@ firefoxesrpkg)
firefoxesr_intl) firefoxesr_intl)
name="Firefox" name="Firefox"
type="dmg" 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." printlog "Found language $userLanguage to be used for Firefox."
if [[ "$userLanguage" == "en" ]]; then if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep -o "=$userLanguage"; then
userLanguage="en_US" 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 fi
printlog "Using language $userLanguage for download."
downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage" 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 # 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 if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then