63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
diff --git a/app/scripts/fetch_xulrunner.orig b/app/scripts/fetch_xulrunner
|
|
index 8b3d918..c6a96ff 100755
|
|
--- a/app/scripts/fetch_xulrunner.orig
|
|
+++ b/app/scripts/fetch_xulrunner
|
|
@@ -132,15 +132,6 @@ function modify_omni {
|
|
# Continue using app.update.auto in prefs.js on Windows
|
|
replace_line 'PER_INSTALLATION_PREFS_PLATFORMS = \["win"\]' 'PER_INSTALLATION_PREFS_PLATFORMS = []' modules/UpdateUtils.jsm
|
|
|
|
- # Prompt if major update is available instead of installing automatically on restart
|
|
- replace_line 'if \(!updateAuto\) \{' 'if (update.type == "major") {
|
|
- LOG("UpdateService:_selectAndInstallUpdate - prompting because it is a major update");
|
|
- AUSTLMY.pingCheckCode(this._pingSuffix, AUSTLMY.CHK_SHOWPROMPT_PREF);
|
|
- Services.obs.notifyObservers(update, "update-available", "show-prompt");
|
|
- return;
|
|
- }
|
|
- if (!updateAuto) {' modules/UpdateService.jsm
|
|
-
|
|
# Avoid console warning about resource://gre/modules/FxAccountsCommon.js
|
|
replace_line 'const logins = this._data.logins;' 'const logins = this._data.logins; if (this._data.logins.length != -1) return;' modules/LoginStore.jsm
|
|
|
|
@@ -470,36 +461,15 @@ fi
|
|
|
|
if [ $BUILD_LINUX == 1 ]; then
|
|
GECKO_VERSION="$GECKO_VERSION_LINUX"
|
|
- DOWNLOAD_URL="https://ftp.mozilla.org/pub/firefox/releases/$GECKO_VERSION"
|
|
|
|
+ rm -rf firefox-x86_64
|
|
|
|
- # Include 32-bit build if not in CI
|
|
- if [[ "${CI:-}" = "1" ]] || [[ "${SKIP_32:-}" = "1" ]]; then
|
|
- arches="x86_64"
|
|
- else
|
|
- arches="i686 x86_64"
|
|
- fi
|
|
- for arch in $arches; do
|
|
- xdir="firefox-$arch"
|
|
- rm -rf $xdir
|
|
-
|
|
- archived_file="firefox-$GECKO_VERSION-$arch.tar.bz2"
|
|
- if [ -e "$archived_file" ]; then
|
|
- echo "Using $archived_file"
|
|
- cp "$archived_file" "firefox-$GECKO_VERSION.tar.bz2"
|
|
- else
|
|
- curl -O "$DOWNLOAD_URL/linux-$arch/en-US/firefox-$GECKO_VERSION.tar.bz2"
|
|
- fi
|
|
-
|
|
- tar xvf firefox-$GECKO_VERSION.tar.bz2
|
|
- mv firefox firefox-$arch
|
|
+ cp -r /usr/lib/firefox-esr firefox-x86_64
|
|
+
|
|
+ pushd firefox-x86_64
|
|
+ modify_omni linux64
|
|
+ popd
|
|
|
|
- pushd firefox-$arch
|
|
- modify_omni
|
|
- popd
|
|
- echo $($SCRIPT_DIR/xulrunner_hash -p l) > hash-linux
|
|
- rm "firefox-$GECKO_VERSION.tar.bz2"
|
|
- done
|
|
fi
|
|
|
|
echo Done
|