From c326a6c97165f16519e35a6beb2ab901021447ca Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 29 Apr 2023 07:45:59 -0400
Subject: [PATCH] Fix more files for combined repos

---
 app/mac/build-and-unify               | 17 +++--------------
 app/scripts/build_and_run             |  2 +-
 chrome.manifest                       |  2 +-
 chrome/content/zotero/xpcom/locale.js |  4 ++--
 js-build/watch.js                     |  2 +-
 test/runtests.sh                      |  2 +-
 6 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/app/mac/build-and-unify b/app/mac/build-and-unify
index a9e4398ec8..6601d88b0d 100755
--- a/app/mac/build-and-unify
+++ b/app/mac/build-and-unify
@@ -2,8 +2,8 @@
 set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOT_DIR="$(dirname "$SCRIPT_DIR")"
-. "$ROOT_DIR/config.sh"
+APP_ROOT_DIR="$(dirname "$SCRIPT_DIR")"
+. "$APP_ROOT_DIR/config.sh"
 
 fx_app_name=Firefox.app
 
@@ -15,17 +15,6 @@ fi
 GECKO_PATH=$1
 mach=$GECKO_PATH/mach
 
-# Set ZOTERO_REPOS_DIR to use directory other than $HOME for zotero-standalone-build
-if [ -n "${ZOTERO_REPOS_DIR:-}" ]; then
-	repos_dir=$ZOTERO_REPOS_DIR
-else
-	repos_dir=$HOME
-fi
-if [ ! -d "$repos_dir/zotero-standalone-build" ]; then
-	echo "$repos_dir/zotero-standalone-build not found" >&2
-	exit 1
-fi
-
 BUILD_DIR=`mktemp -d`
 function cleanup {
 	rm -rf $BUILD_DIR
@@ -65,4 +54,4 @@ $mach python "$GECKO_PATH/toolkit/mozapps/installer/unify.py" x64/*.app aarch64/
 
 cp x64/$fx_app_name/Contents/MacOS/firefox zotero
 xz zotero
-mv zotero.xz "$repos_dir"/zotero-standalone-build/mac/zotero.xz
+mv zotero.xz "$APP_ROOT_DIR/mac/zotero.xz"
diff --git a/app/scripts/build_and_run b/app/scripts/build_and_run
index f3eddba504..97a50f250a 100755
--- a/app/scripts/build_and_run
+++ b/app/scripts/build_and_run
@@ -41,7 +41,7 @@ if [ $REBUILD -eq 1 ]; then
 	
 	# Check if build watch is running
 	# If not, run now
-	if ! ps u | grep scripts/build.js | grep -v grep > /dev/null; then
+	if ! ps u | grep js-build/build.js | grep -v grep > /dev/null; then
 		echo "Running JS build process"
 		echo
 		cd $ROOT_DIR
diff --git a/chrome.manifest b/chrome.manifest
index bd33514f01..5920cc25d5 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -11,7 +11,7 @@ content	zotero-platform-version chrome/content/zotero-platform/mac-big-sur/ os=D
 
 resource zotero				resource/
 
-# Keep in sync with locale.js and zotero-standalone-build:assets/multilocale.txt
+# Keep in sync with locale.js and app/assets/multilocale.txt
 locale	zotero	en-US		chrome/locale/en-US/zotero/
 #locale	zotero	af-ZA		chrome/locale/af-ZA/zotero/
 locale	zotero	ar		chrome/locale/ar/zotero/
diff --git a/chrome/content/zotero/xpcom/locale.js b/chrome/content/zotero/xpcom/locale.js
index 68050a14a9..9f3088df5e 100644
--- a/chrome/content/zotero/xpcom/locale.js
+++ b/chrome/content/zotero/xpcom/locale.js
@@ -1,7 +1,7 @@
 Zotero.Locale = {
 	/**
-	 * Keep this up to date with zotero-standalone-build:assets/multilocale.txt,
-	 * zotero-build/dictionaries/build-dictionaries, and possibly chrome.manifest
+	 * Keep this up to date with app/assets/multilocale.txt,
+	 * scripts/dictionaries/build-dictionaries, and possibly chrome.manifest
 	 *
 	 * Names from https://addons.mozilla.org/en-US/firefox/language-tools/
 	 */
diff --git a/js-build/watch.js b/js-build/watch.js
index e8645b14a4..8534eb1a34 100644
--- a/js-build/watch.js
+++ b/js-build/watch.js
@@ -12,7 +12,7 @@ const getSymlinks = require('./symlinks');
 
 
 const ROOT = path.resolve(__dirname, '..');
-const addOmniExecPath = path.join(ROOT, '..', 'zotero-standalone-build', 'scripts', 'add_omni_file');
+const addOmniExecPath = path.join(ROOT, 'app', 'scripts', 'add_omni_file');
 let shouldAddOmni = false;
 
 const source = [
diff --git a/test/runtests.sh b/test/runtests.sh
index 1f08f34cbb..bafc7694fc 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -156,7 +156,7 @@ trap "{ rm -rf \"$TEMPDIR\"; }" EXIT
 
 # Check if build watch process is running
 # If not, run now
-if [[ -z "$CI" ]] && ! ps | grep scripts/build.js | grep -v grep > /dev/null; then
+if [[ -z "$CI" ]] && ! ps | grep js-build/build.js | grep -v grep > /dev/null; then
 	echo
 	echo "Running JS build process"
 	cd "$ROOT_DIR"