From b6b6bbc3eeddeec5191573c971fb8ca365db0611 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 27 Apr 2023 00:34:31 -0400
Subject: [PATCH] Load integration manifest files only on correct platform

---
 app/build.sh    | 8 ++++++++
 chrome.manifest | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.sh b/app/build.sh
index 8044b48ff3..107be71136 100755
--- a/app/build.sh
+++ b/app/build.sh
@@ -323,6 +323,7 @@ elif [ $BUILD_LINUX == 1 ]; then
 fi
 
 # Add word processor plug-ins
+echo >> chrome.manifest
 if [ $BUILD_MAC == 1 ]; then
 	pluginDir="$CALLDIR/modules/zotero-word-for-mac-integration"
 	mkdir -p "integration/word-for-mac"
@@ -336,6 +337,9 @@ if [ $BUILD_MAC == 1 ]; then
 	echo >> $prefs_file
 	cat "$CALLDIR/modules/zotero-word-for-mac-integration/defaults/preferences/zoteroMacWordIntegration.js" >> $prefs_file
 	echo >> $prefs_file
+	
+	echo "manifest	integration/word-for-mac/chrome.manifest" >> chrome.manifest
+	
 elif [ $BUILD_WIN == 1 ]; then
 	pluginDir="$CALLDIR/modules/zotero-word-for-windows-integration"
 	mkdir -p "integration/word-for-windows"
@@ -349,6 +353,8 @@ elif [ $BUILD_WIN == 1 ]; then
 	echo >> $prefs_file
 	cat "$CALLDIR/modules/zotero-word-for-windows-integration/defaults/preferences/zoteroWinWordIntegration.js" >> $prefs_file
 	echo >> $prefs_file
+	
+	echo "manifest	integration/word-for-windows/chrome.manifest" >> chrome.manifest
 fi
 # Libreoffice plugin for all platforms
 pluginDir="$CALLDIR/modules/zotero-libreoffice-integration"
@@ -365,6 +371,8 @@ echo >> $prefs_file
 cat "$CALLDIR/modules/zotero-libreoffice-integration/defaults/preferences/zoteroLibreOfficeIntegration.js" >> $prefs_file
 echo >> $prefs_file
 
+echo "manifest	integration/libreoffice/chrome.manifest" >> chrome.manifest
+
 # Delete files that shouldn't be distributed
 find chrome -name .DS_Store -exec rm -f {} \;
 
diff --git a/chrome.manifest b/chrome.manifest
index ceeca0866a..bd33514f01 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -78,8 +78,3 @@ contract	@mozilla.org/network/protocol;1?name=zotero 	{9BC3D762-9038-486A-9D70-C
 content scaffold             chrome/content/scaffold/
 locale  scaffold   en-US     chrome/locale/en-US/scaffold/
 skin    scaffold   default   chrome/skin/default/scaffold/
-
-# Word Plugins
-manifest	integration/libreoffice/chrome.manifest
-manifest	integration/word-for-windows/chrome.manifest
-manifest	integration/word-for-mac/chrome.manifest