80 lines
2.8 KiB
Diff
80 lines
2.8 KiB
Diff
|
diff --git a/fetch_xulrunner.sh.orig b/fetch_xulrunner.sh
|
||
|
|
index b1e812f..ca3caa5 100755
|
||
|
|
--- a/fetch_xulrunner.sh.orig
|
||
|
|
+++ b/fetch_xulrunner.sh
|
||
|
|
@@ -114,15 +114,6 @@ function modify_omni {
|
||
|
|
replace_line 'MOZ_CRASHREPORTER:' 'MOZ_CRASHREPORTER: false \&\&' modules/AppConstants.jsm
|
||
|
|
replace_line 'MOZ_UPDATE_CHANNEL:.+' 'MOZ_UPDATE_CHANNEL: "none",' modules/AppConstants.jsm
|
||
|
|
replace_line '"https:\/\/[^\/]+mozilla.com.+"' '""' modules/AppConstants.jsm
|
||
|
|
-
|
||
|
|
- 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
|
||
|
|
-
|
||
|
|
replace_line 'pref\("network.captive-portal-service.enabled".+' 'pref("network.captive-portal-service.enabled", false);' greprefs.js
|
||
|
|
replace_line 'pref\("network.connectivity-service.enabled".+' 'pref("network.connectivity-service.enabled", false);' greprefs.js
|
||
|
|
replace_line 'pref\("toolkit.telemetry.server".+' 'pref("toolkit.telemetry.server", "");' greprefs.js
|
||
|
|
@@ -368,31 +359,13 @@ 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
|
||
|
|
-
|
||
|
|
- curl -O "$DOWNLOAD_URL/linux-i686/en-US/firefox-$GECKO_VERSION.tar.bz2"
|
||
|
|
- rm -rf firefox-i686
|
||
|
|
- tar xvf firefox-$GECKO_VERSION.tar.bz2
|
||
|
|
- mv firefox firefox-i686
|
||
|
|
-
|
||
|
|
- pushd firefox-i686
|
||
|
|
- modify_omni linux32
|
||
|
|
- popd
|
||
|
|
-
|
||
|
|
- rm "firefox-$GECKO_VERSION.tar.bz2"
|
||
|
|
-
|
||
|
|
- curl -O "$DOWNLOAD_URL/linux-x86_64/en-US/firefox-$GECKO_VERSION.tar.bz2"
|
||
|
|
rm -rf firefox-x86_64
|
||
|
|
- tar xvf firefox-$GECKO_VERSION.tar.bz2
|
||
|
|
- mv firefox firefox-x86_64
|
||
|
|
-
|
||
|
|
- pushd firefox-x86_64
|
||
|
|
- modify_omni linux64
|
||
|
|
- popd
|
||
|
|
-
|
||
|
|
- rm "firefox-$GECKO_VERSION.tar.bz2"
|
||
|
|
+ cp -r /usr/lib/firefox-esr firefox-x86_64
|
||
|
|
+
|
||
|
|
+ pushd firefox-x86_64
|
||
|
|
+ modify_omni linux64
|
||
|
|
+ popd
|
||
|
|
fi
|
||
|
|
|
||
|
|
echo Done
|
||
|
|
diff --git a/build.sh.orig b/build.sh
|
||
|
|
index 893f9fb..51ae170 100755
|
||
|
|
--- a/build.sh.orig
|
||
|
|
+++ b/build.sh
|
||
|
|
@@ -794,7 +794,7 @@ fi
|
||
|
|
|
||
|
|
# Linux
|
||
|
|
if [ $BUILD_LINUX == 1 ]; then
|
||
|
|
- for arch in "i686" "x86_64"; do
|
||
|
|
+ for arch in "x86_64"; do
|
||
|
|
runtime_path="${LINUX_RUNTIME_PATH_PREFIX}${arch}"
|
||
|
|
|
||
|
|
# Set up directory
|
||
|
|
@@ -807,7 +807,7 @@ if [ $BUILD_LINUX == 1 ]; then
|
||
|
|
cp -r "$runtime_path/"!(application.ini|browser|defaults|devtools-files|crashreporter|crashreporter.ini|firefox|pingsender|precomplete|removed-files|run-mozilla.sh|update-settings.ini|updater|updater.ini) "$APPDIR"
|
||
|
|
|
||
|
|
# Use our own launcher that calls the original Firefox executable with -app
|
||
|
|
- mv "$APPDIR"/firefox-bin "$APPDIR"/zotero-bin
|
||
|
|
+ mv "$APPDIR"/firefox-esr "$APPDIR"/zotero-bin
|
||
|
|
cp "$CALLDIR/linux/zotero" "$APPDIR"/zotero
|
||
|
|
|
||
|
|
# Copy Ubuntu launcher files
|