44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
diff --git a/app/build.sh.orig b/app/build.sh
|
|
index 649d629..642ce81 100755
|
|
--- a/app/build.sh.orig
|
|
+++ b/app/build.sh
|
|
@@ -59,10 +59,7 @@ function abspath {
|
|
}
|
|
|
|
function check_lfs_file {
|
|
- if [ "$(head --bytes 5 "$1")" = "versi" ]; then
|
|
- echo "$1 not checked out -- install Git LFS and run 'git lfs pull'" >&2
|
|
- exit 1
|
|
- fi
|
|
+ return 0
|
|
}
|
|
|
|
SOURCE_DIR=""
|
|
@@ -840,18 +837,13 @@ 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
|
|
cp "$CALLDIR/linux/zotero.desktop" "$APPDIR"
|
|
cp "$CALLDIR/linux/set_launcher_icon" "$APPDIR"
|
|
|
|
- # Use our own updater, because Mozilla's requires updates signed by Mozilla
|
|
- check_lfs_file "$CALLDIR/linux/updater.tar.xz"
|
|
- tar xf "$CALLDIR/linux/updater.tar.xz" --to-stdout updater-$arch > "$APPDIR/updater"
|
|
- chmod 755 "$APPDIR/updater"
|
|
-
|
|
# Copy app files
|
|
rsync -a "$base_dir/" "$APPDIR/"
|
|
|
|
@@ -860,6 +852,7 @@ if [ $BUILD_LINUX == 1 ]; then
|
|
cp -RH "$CALLDIR/modules/zotero-libreoffice-integration/install" "$APPDIR/integration/libreoffice"
|
|
|
|
# Copy icons
|
|
+ mkdir -p "$APPDIR"/icons
|
|
cp "$CALLDIR/linux/icons/icon128.png" "$APPDIR/icons/"
|
|
cp "$CALLDIR/linux/icons/symbolic.svg" "$APPDIR/icons/"
|
|
|