mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Ignore Firefox components folder during build

Browse source 
After the removal of zotero-service.js for fx115, we no longer have a
`components` folder, so we don't need to shuffle things around to merge
our folder with the one from Firefox.

This fixes a build failure we were getting in CI after #3894.
This commit is contained in:
Dan Stillman 2024-03-29 07:04:08 -04:00
parent 8cd2c41e25
commit 2ec6c7c72e
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.sh
View file

@ -246,7 +246,6 @@ set -e
cd $omni_dir cd $omni_dir
# Move some Firefox files that would be overwritten out of the way # Move some Firefox files that would be overwritten out of the way
mv chrome.manifest chrome.manifest-fx mv chrome.manifest chrome.manifest-fx
mv components components-fx
mv defaults defaults-fx mv defaults defaults-fx
# Extract Zotero files # Extract Zotero files
@ -262,13 +261,6 @@ else
rsync -a $rsync_params "$SOURCE_DIR/" ./ rsync -a $rsync_params "$SOURCE_DIR/" ./
fi fi
#
# Merge preserved files from Firefox
#
# components
rmdir components
mv components-fx components
mv defaults defaults-z mv defaults defaults-z
mv defaults-fx defaults mv defaults-fx defaults
prefs_file=defaults/preferences/zotero.js prefs_file=defaults/preferences/zotero.js