zotero-plugin 6.0.2 → 6.1.0

package/bin/fetch-log.mjs

@@ -11,7 +11,7 @@ import { Entry as KeyRingEntry } from "@napi-rs/keyring";
 import prompts from "prompts";
 
 // package.json
-var version = "6.0.2";
+var version = "6.1.0";
 
 // bin/crypto.ts
 import crypto from "crypto";

package/bin/release.mjs

@@ -15,7 +15,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "zotero-plugin",
-      version: "6.0.2",
+      version: "6.1.0",
       description: "Zotero plugin builder",
       homepage: "https://github.com/retorquere/zotero-plugin/wiki",
       bin: {

package/bin/start.mjs

@@ -1,15 +1,13 @@
 #!/usr/bin/env node
 
 // bin/start.ts
-import { exec as childProcessExec } from "child_process";
+import { exec, spawn } from "child_process";
 import { program } from "commander";
 import fs from "fs";
 import { globSync } from "glob";
 import ini from "ini";
 import os from "os";
 import path from "path";
-import { promisify } from "util";
-var execPromise = promisify(childProcessExec);
 program.option("-b, --beta", "start beta");
 program.parse(process.argv);
 var options = program.opts();
@@ -123,24 +121,20 @@ function patch_prefs(prefs, add_config) {
   }
   fs.writeFileSync(prefs_path, new_lines.join("\n"));
 }
-async function system(cmd) {
-  console.log("$", cmd);
-  try {
-    const { stdout, stderr } = await execPromise(cmd);
-    if (stdout) console.log(stdout);
-    if (stderr) console.error(stderr);
-  } catch (error) {
-    const err = error;
-    console.error(`Command failed with exit code ${err.code || 1}: ${err.message}`);
-    process.exit(err.code || 1);
-  }
-}
 async function main() {
   try {
     patch_prefs("prefs", false);
     patch_prefs("user", true);
     if (config.plugin.build) {
-      await system(config.plugin.build);
+      await new Promise((resolve, reject) => {
+        exec(config.plugin.build, (error, stdout, stderr) => {
+          if (error) {
+            reject(error);
+          } else {
+            resolve();
+          }
+        });
+      });
     }
     if (config.zotero.db) {
       fs.copyFileSync(config.zotero.db, path.join(config.profile.path, "zotero", "zotero.sqlite"));
@@ -157,22 +151,27 @@ async function main() {
     console.log("Source path:", sources);
     console.log("Proxy file path:", plugin_path);
     fs.writeFileSync(plugin_path, proxyPath);
-    const zoteroDebugFlag = config.windows ? "-ZoteroDebug" : "-ZoteroDebugText";
-    const cmdParts = [
+    const cmd = [
       config.zotero.path,
       "-purgecaches",
       "-P",
       config.profile.name,
-      zoteroDebugFlag,
+      config.windows ? "-ZoteroDebug" : "-ZoteroDebugText",
       "-jsconsole",
       "-datadir",
       "profile"
     ];
+    let child;
     if (config.zotero.log) {
-      cmdParts.push(`> ${config.zotero.log}`);
-      if (!config.windows) cmdParts.push("&");
+      const log = fs.openSync(config.zotero.log, "w");
+      child = spawn(cmd[0], cmd.slice(1), {
+        detached: true,
+        stdio: ["ignore", log, "ignore"]
+      });
+    } else {
+      child = spawn(cmd[0], cmd.slice(1));
     }
-    await system(cmdParts.join(" "));
+    child.unref();
   } catch (err) {
     console.error(err);
   }

package/manifest.js

@@ -11,7 +11,7 @@ const root_1 = tslib_1.__importDefault(require("./root"));
 const version_1 = tslib_1.__importDefault(require("./version"));
 const pkg = { ...require(path.join(root_1.default, 'package.json')) };
 if (!pkg.id)
-    pkg.id = `${pkg.name.replace(/^zotero-/, '')}@${pkg.author.email.replace(/.*@/, '')}`.toLowerCase();
+    pkg.id = `${pkg.name}@${pkg.author.email.replace(/.*@/, '')}`.toLowerCase();
 if (pkg.xpi)
     Object.assign(pkg, pkg.xpi);
 pkg.version = version_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zotero-plugin",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "description": "Zotero plugin builder",
   "homepage": "https://github.com/retorquere/zotero-plugin/wiki",
   "bin": {