Update to Zotero 6.0.36

pedrom34 · Mar 19, 2024 · 3f3a3eb · 3f3a3eb
1 parent 34dadcb
commit 3f3a3eb
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 66 deletions.
diff --git a/App/AppInfo/appinfo.ini b/App/AppInfo/appinfo.ini
@@ -18,8 +18,8 @@ Freeware=true
 CommercialUse=true
 
 [Version]
-PackageVersion=6.0.30.0
-DisplayVersion=6.0.30
+PackageVersion=6.0.36.0
+DisplayVersion=6.0.36
 
 [Control]
 Icons=1

diff --git a/App/Readme.txt b/App/Readme.txt
@@ -1,3 +1,3 @@
-The files in this directory are necessary for the portable application to
-function.  There is normally no need to directly access or alter any of the
-files within these directories.
+This directory contains files used by the portable app and should generally not be accessed directly by users except in specific instances of using plugins or other documented additions to a given app.
+
+User files, data, or settings should not be stored within the App directory or its subdirectories. Any data stored within the App directory structure will likely be deleted on upgrades.
diff --git a/App/Zotero/application.ini b/App/Zotero/application.ini
@@ -1,8 +1,8 @@
 [App]
 Vendor=Zotero
 Name=Zotero
-Version=6.0.30
-BuildID=20231102220531
+Version=6.0.36
+BuildID=20240313202508
 Copyright=Copyright (c) 2006-2018 Contributors
 ID[email protected]
 

diff --git a/App/Zotero/extensions/[email protected]/chrome/install.js b/App/Zotero/extensions/[email protected]/chrome/install.js
@@ -306,10 +306,10 @@ function jreRequiredPageShown() {
 /**
  * Called when openoffice-installations wizardpage is shown
  */
-function openofficeInstallationsPageShown() {
+async function openofficeInstallationsPageShown() {
 	wizard.canAdvance = false;
 
-	var installations = ZoteroOpenOfficeIntegration.getInstallations();
+	var installations = await ZoteroOpenOfficeIntegration.getInstallations();
 
 	// add installations to listbox
 	var listbox = document.getElementById("installations-listbox");

diff --git a/...tensions/[email protected]/components/zoteroOpenOfficeIntegration.js b/...tensions/[email protected]/components/zoteroOpenOfficeIntegration.js
@@ -216,7 +216,7 @@ var Comm = new function() {
 		/**
 		 * Processes a completed frame
 		 */
-		"_processFrame":function() {
+		_processFrame: async function() {
 			this._frameHeader = "";
 			this._frameRemaining = null;
 			var input = _converter.ConvertToUnicode(this._frameContent);
@@ -244,13 +244,12 @@ var Comm = new function() {
 				}
 
 				// Transmit to callback
-				Zotero.setTimeout(function() {
-					if(err) {
-						callbacks[1](err);
-					} else {
-						callbacks[0](payload);
-					}
-				}, 0);
+				await Zotero.Promise.delay();
+				if (err) {
+					callbacks[1](err);
+				} else {
+					callbacks[0](payload);
+				}
 			}
 		},
 

diff --git a/App/Zotero/extensions/[email protected]/install.rdf b/App/Zotero/extensions/[email protected]/install.rdf
@@ -4,7 +4,7 @@
 <Description about="urn:mozilla:install-manifest">
 	<em:id>[email protected]</em:id>
 	<em:name>Zotero LibreOffice Integration</em:name>
-	<em:version>6.0.4.SA.6.0.30</em:version>
+	<em:version>6.0.4.SA.6.0.36</em:version>
 	<em:creator>Zotero</em:creator>
 	<em:developer>Simon Kornblith</em:developer>
 	<em:homepageURL>https://www.zotero.org</em:homepageURL>

diff --git a/App/Zotero/extensions/[email protected]/resource/installer.jsm b/App/Zotero/extensions/[email protected]/resource/installer.jsm
@@ -34,28 +34,14 @@ const UNOPKG_LOCATIONS = {
 		"/Applications/LibreOffice.app/Contents/MacOS/unopkg",
 	],
 	Win:[
+		"C:\\Program Files\\LibreOffice\\program\\unopkg.exe",
+		"C:\\Program Files (x86)\\LibreOffice\\program\\unopkg.exe",
+		"C:\\Program Files\\LibreOffice 7\\program\\unopkg.exe",
+		"C:\\Program Files (x86)\\LibreOffice 7\\program\\unopkg.exe",
 		"C:\\Program Files\\LibreOffice 6\\program\\unopkg.exe",
 		"C:\\Program Files (x86)\\LibreOffice 6\\program\\unopkg.exe",
 		"C:\\Program Files\\LibreOffice 5\\program\\unopkg.exe",
 		"C:\\Program Files (x86)\\LibreOffice 5\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 4\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 4\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 4.0\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 4.0\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 4.1\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 4.1\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 3\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 3\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 3.3\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 3.3\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 3.4\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 3.4\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 3.5\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 3.5\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 3.6\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 3.6\\program\\unopkg.exe",
-		"C:\\Program Files\\LibreOffice 3.7\\program\\unopkg.exe",
-		"C:\\Program Files (x86)\\LibreOffice 3.7\\program\\unopkg.exe",
 	],
 	Other:[
 		"/usr/bin/unopkg",
@@ -67,31 +53,6 @@ const UNOPKG_LOCATIONS = {
 		"/usr/lib64/libreoffice4/program/unopkg",
 		"/usr/lib/libreoffice3/program/unopkg",
 		"/usr/lib64/libreoffice3/program/unopkg",
-
-		"/opt/libreoffice/program/unopkg",
-		"/opt/libreoffice3/program/unopkg",
-		"/opt/libreoffice3.4/program/unopkg",
-		"/opt/libreoffice3.5/program/unopkg",
-		"/opt/libreoffice3.6/program/unopkg",
-		"/opt/libreoffice3.7/program/unopkg",
-		"/opt/libreoffice4.0/program/unopkg",
-		"/opt/libreoffice4.1/program/unopkg",
-		"/opt/libreoffice4.2/program/unopkg",
-		"/opt/libreoffice5.0/program/unopkg",
-		"/opt/libreoffice5.1/program/unopkg",
-		"/opt/libreoffice5.2/program/unopkg",
-		"/opt/libreoffice5.3/program/unopkg",
-		"/opt/libreoffice5.4/program/unopkg",
-		"/opt/libreoffice6.0/program/unopkg",
-		"/opt/libreoffice6.1/program/unopkg",
-		"/opt/libreoffice6.2/program/unopkg",
-		"/opt/libreoffice6.3/program/unopkg",
-		"/opt/libreoffice6.4/program/unopkg",
-		"/opt/libreoffice7.0/program/unopkg",
-		"/opt/libreoffice7.1/program/unopkg",
-		"/opt/libreoffice7.2/program/unopkg",
-		"/opt/libreoffice7.3/program/unopkg",
-		"/opt/libreoffice7.4/program/unopkg"
 	]
 };
 
@@ -135,7 +96,7 @@ var Plugin = new function() {
 		return "Other";
 	});
 
-	this.install = function(zpi) {
+	this.install = async function(zpi) {
 		if(wizardWindow && !wizardWindow.closed) {
 			wizardWindow.focus();
 			return;
@@ -146,7 +107,7 @@ var Plugin = new function() {
 		this.pathToAddon = zoteroPluginInstaller.getAddonPath(this.EXTENSION_ID);
 
 		// look for installations
-		var installations = this.getInstallations(),
+		var installations = await this.getInstallations(),
 			haveSelectedPaths = false,
 			havePaths = false;
 		for(var i in installations) {
@@ -198,7 +159,7 @@ var Plugin = new function() {
 	 * has not selected in the past, and installations that were not
 	 * previously known, respectively.
 	 */
-	this.getInstallations = function() {
+	this.getInstallations = async function() {
 		// First try getting unopkg paths pref
 		var previousPaths, paths = {};
 		try {
@@ -248,6 +209,13 @@ var Plugin = new function() {
 				potentialLocations.push(path);
 			}
 		}
+		else if (Zotero.isLinux) {
+			await Zotero.File.iterateDirectory('/opt', async (entry) => {
+				if (entry.name.startsWith('libreoffice')) {
+					potentialLocations.push(entry.path + '/program/unopkg');
+				}
+			});
+		}
 
 		for (let potentialLocation of potentialLocations) {
 			try {

diff --git a/App/Zotero/extensions/[email protected]/install.rdf b/App/Zotero/extensions/[email protected]/install.rdf
@@ -4,7 +4,7 @@
 <Description about="urn:mozilla:install-manifest">
 	<em:id>[email protected]</em:id>
 	<em:name>Zotero Word for Windows Integration</em:name>
-	<em:version>6.0.3.SA.6.0.30</em:version>
+	<em:version>6.0.4.SA.6.0.36</em:version>
 	<em:creator>Zotero</em:creator>
 	<em:developer>Simon Kornblith</em:developer>
 	<em:homepageURL>https://www.zotero.org</em:homepageURL>

diff --git a/App/Zotero/extensions/[email protected]/install/Zotero.dotm b/App/Zotero/extensions/[email protected]/install/Zotero.dotm
diff --git a/App/Zotero/extensions/[email protected]/resource/installer.jsm b/App/Zotero/extensions/[email protected]/resource/installer.jsm
@@ -53,7 +53,7 @@ var Plugin = new function() {
 		required: false
 	}];
 	// Bump to make Zotero update the template (Zotero.dotm) for existing installs. Do not remove "pre"
-	this.LAST_INSTALLED_FILE_UPDATE = "6.0.3pre";
+	this.LAST_INSTALLED_FILE_UPDATE = "6.0.4pre";
 
 	var zoteroPluginInstaller;
 

diff --git a/App/Zotero/pdfinfo.exe b/App/Zotero/pdfinfo.exe
diff --git a/App/Zotero/pdftotext.exe b/App/Zotero/pdftotext.exe
diff --git a/App/Zotero/uninstall/helper.exe b/App/Zotero/uninstall/helper.exe
diff --git a/App/Zotero/updater.exe b/App/Zotero/updater.exe
diff --git a/App/Zotero/zotero.exe b/App/Zotero/zotero.exe
diff --git a/App/Zotero/zotero.jar b/App/Zotero/zotero.jar
diff --git a/ZoteroPortable.exe b/ZoteroPortable.exe
diff --git a/changelog.fr.md b/changelog.fr.md
@@ -1,5 +1,7 @@
 Historique des versions :
 ----
+- 2024-03-19. Mise à jour vers Zotero 6.0.36 + modification plugin MS Word (merci @AndhikaWB)
+
 - 2023-11-03. Mise à jour vers Zotero 6.0.30.
 
 - 2023-09-05. Mise à jour vers Zotero 6.0.27.

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 Versions history:
 ----
+- 2024-03-19. Update to Zotero 6.0.36 + change related to MS Word plugin (thanks to @AndhikaWB).
+
 - 2023-11-03. Update to Zotero 6.0.30.
 
 - 2023-09-05. Update to Zotero 6.0.27.