From 2ec6c7c72e0a2eb38d01e04cafbbd0afefa8dc1a Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 29 Mar 2024 07:04:08 -0400 Subject: [PATCH] Ignore Firefox components folder during build 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. --- app/build.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/build.sh b/app/build.sh index 033ecca6f1..01b965effb 100755 --- a/app/build.sh +++ b/app/build.sh @@ -246,7 +246,6 @@ set -e cd $omni_dir # Move some Firefox files that would be overwritten out of the way mv chrome.manifest chrome.manifest-fx -mv components components-fx mv defaults defaults-fx # Extract Zotero files @@ -262,13 +261,6 @@ else rsync -a $rsync_params "$SOURCE_DIR/" ./ fi -# -# Merge preserved files from Firefox -# -# components -rmdir components -mv components-fx components - mv defaults defaults-z mv defaults-fx defaults prefs_file=defaults/preferences/zotero.js