From 44ed519049bed6104add6ed7b9b46618366298f1 Mon Sep 17 00:00:00 2001 From: hensm Date: Sat, 22 Dec 2018 15:26:37 +0000 Subject: [PATCH] Fix registry key creation --- app/bin/install-manifest.js | 18 ++++----- app/package-lock.json | 78 +++++-------------------------------- app/package.json | 2 +- ext/src/manifest.json | 2 +- 4 files changed, 20 insertions(+), 80 deletions(-) diff --git a/app/bin/install-manifest.js b/app/bin/install-manifest.js index a9088a0..5744434 100644 --- a/app/bin/install-manifest.js +++ b/app/bin/install-manifest.js @@ -48,21 +48,19 @@ switch (platform) { }; case "win32": { - const regedit = require("regedit"); + const { Registry } = require("rage-edit"); + const REGISTRY_PATH = `HKCU\\SOFTWARE\\Mozilla\\NativeMessagingHosts\\${WIN_REGISTRY_KEY}`; if (argv.remove) { - // TODO: no corresponding method in regedit lib + Registry.delete(REGISTRY_PATH); break; } - regedit.putValue({ - "HKEY_CURRENT_USER\\SOFTWARE\\Mozilla\\NativeMessagingHosts": { - [WIN_REGISTRY_KEY]: { - value: CURRENT_MANIFEST_PATH - , type: "REG_DEFAULT" - } - } - }); + Registry.set( + REGISTRY_PATH + , "" + , CURRENT_MANIFEST_PATH + , "REG_SZ"); break; }; diff --git a/app/package-lock.json b/app/package-lock.json index 0f7ff70..2bca649 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1374,7 +1374,8 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true }, "cryptiles": { "version": "3.1.4", @@ -2537,12 +2538,6 @@ "sshpk": "^1.7.0" } }, - "if-async": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/if-async/-/if-async-3.7.4.tgz", - "integrity": "sha1-VYaN6wCT08Z79xZudFNT+5vLIaI=", - "optional": true - }, "ignore": { "version": "3.3.10", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", @@ -2568,7 +2563,8 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true }, "into-stream": { "version": "4.0.0", @@ -3392,6 +3388,12 @@ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "dev": true }, + "rage-edit": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/rage-edit/-/rage-edit-1.2.0.tgz", + "integrity": "sha512-0RspBRc2s6We4g7hRCvT5mu7YPEnfjvQK8Tt354a2uUNJCMC7MKLvo/1mLvHUCQ/zbP6siQyp5VRZN7UCpMFZg==", + "optional": true + }, "readable-stream": { "version": "2.3.6", "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", @@ -3419,18 +3421,6 @@ "readable-stream": "^2.0.2" } }, - "regedit": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/regedit/-/regedit-3.0.0.tgz", - "integrity": "sha512-LzVCSTtl1PiR8meC1EJAt72XNI2BNPHHluQvpKsosP8xqm1kEGurSHpbdkEsAWFAJlSaou0+q2M6pTaAb2TkeQ==", - "optional": true, - "requires": { - "debug": "^2.1.1", - "if-async": "^3.7.4", - "stream-slicer": "0.0.6", - "through2": "^0.6.3" - } - }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -3856,12 +3846,6 @@ "readable-stream": "^2.1.4" } }, - "stream-slicer": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/stream-slicer/-/stream-slicer-0.0.6.tgz", - "integrity": "sha1-+GsqxcJEC3oKh7cfM2ZcB4gEYTg=", - "optional": true - }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -3892,48 +3876,6 @@ "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=", "dev": true }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "optional": true, - "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "optional": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "optional": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "optional": true - } - } - }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", diff --git a/app/package.json b/app/package.json index 7a48068..decb226 100644 --- a/app/package.json +++ b/app/package.json @@ -31,6 +31,6 @@ "pkg": "^4.3.5" }, "optionalDependencies": { - "regedit": "^3.0.0" + "rage-edit": "^1.2.0" } } diff --git a/ext/src/manifest.json b/ext/src/manifest.json index fab5dd1..d53828d 100755 --- a/ext/src/manifest.json +++ b/ext/src/manifest.json @@ -6,7 +6,7 @@ , "applications": { "gecko": { "id": "EXTENSION_ID" - , "strict_min_version": "57.0" + , "strict_min_version": "64.0" } }