From cb644c202d9319a059dc3f96e7de66041ea18ab7 Mon Sep 17 00:00:00 2001 From: girst Date: Tue, 9 Jul 2019 22:04:02 +0200 Subject: don't overwrite chrome.manifest this hopefully makes the monkey patch update persistent. Note: instead of using FileUtils, this would be another method: const {Services} = Cu.import('resource://gre/modules/Services.jsm'); let manifest = Services.dirsvc.get('GreD', Ci.nsIFile); manifest.append('legacy.manifest'); --- Makefile | 4 ++-- chrome.manifest | 1 - config.js | 6 ++---- legacy.manifest | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 chrome.manifest create mode 100644 legacy.manifest diff --git a/Makefile b/Makefile index 975ed7b..1dccb57 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ .PHONY: all install -files := chrome.manifest -files += config.js +files := config.js files += defaults/pref/config-prefs.js +files += legacy.manifest files += legacy/BootstrapLoader.jsm files += legacy/RDFDataSource.jsm files += legacy/RDFManifestConverter.jsm diff --git a/chrome.manifest b/chrome.manifest deleted file mode 100644 index 5da5b9e..0000000 --- a/chrome.manifest +++ /dev/null @@ -1 +0,0 @@ -content legacy legacy/ diff --git a/config.js b/config.js index fa98b6d..2514b7b 100644 --- a/config.js +++ b/config.js @@ -8,11 +8,9 @@ try { "ALLOW_LEGACY_EXTENSIONS": true, }; - let manifest = Cc['@mozilla.org/file/directory_service;1'] - .getService(Ci.nsIProperties).get('GreD', Ci.nsIFile); - manifest.append('chrome.manifest'); + const {FileUtils} = Cu.import('resource://gre/modules/FileUtils.jsm'); Components.manager.QueryInterface(Ci.nsIComponentRegistrar) - .autoRegister(manifest); + .autoRegister(FileUtils.getFile('GreD', ['legacy.manifest'])); const {AddonManager} = Cu.import('resource://gre/modules/AddonManager.jsm'); const {BootstrapLoader} = Cu.import('chrome://legacy/content/BootstrapLoader.jsm'); diff --git a/legacy.manifest b/legacy.manifest new file mode 100644 index 0000000..5da5b9e --- /dev/null +++ b/legacy.manifest @@ -0,0 +1 @@ +content legacy legacy/ -- cgit v1.2.3