From 3644b819d79db6be6cebb8337908ce184ecad0c1 Mon Sep 17 00:00:00 2001
From: girst <girst@users.noreply.github.com>
Date: Mon, 24 Jun 2019 16:06:59 +0200
Subject: [PATCH] remove boot.jsm

---
 README          | 5 ++---
 config.js       | 9 +++++++--
 legacy/boot.jsm | 7 -------
 3 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 legacy/boot.jsm

diff --git a/README b/README
index 645514d..2938517 100644
--- a/README
+++ b/README
@@ -4,14 +4,13 @@ Monkeypatching Firefox Quantum to run VimFx
 
 == Installation ==
 0. Install/upgrade Firefox from your distribution's repositories
-1. As root, issue `make install`
+1. As root, issue `make install` (or manually untar into /usr/lib{,64}/firefox)
 2. Install VimFx from https://github.com/akhodakivskiy/VimFx/releases
 
 == Notes ==
- * boot.jsm was lifted from https://github.com/xiaoxiaoflood/firefox-scripts.git
  * BootstrapLoader.jsm, RDFDataSource.jsm, RDFManifestConverter.jsm from their
    last commit in comm-central (8a37a90aab4ec643fce1e1ab33984613ce0b492d)
- * config.js: own work
+ * config.js: own work (compare mozilla-central 061b97e02ede)
 
 == Disclaimer & License ==
 
diff --git a/config.js b/config.js
index 35e6bbf..e568b52 100644
--- a/config.js
+++ b/config.js
@@ -9,5 +9,10 @@ try {
     "ALLOW_LEGACY_EXTENSIONS": true,
   };
 
-  Cu.import('chrome://legacy/content/boot.jsm'); // engage the bootstrap loader
-} catch(ex) {}
+  // engage the bootstrap loader:
+  const {AddonManager} = Cu.import('resource://gre/modules/AddonManager.jsm');
+  const {BootstrapLoader} = Cu.import('chrome://legacy/content/BootstrapLoader.jsm');
+  AddonManager.addExternalExtensionLoader(BootstrapLoader);
+} catch(ex) {
+  Components.utils.reportError(ex.message);
+}
diff --git a/legacy/boot.jsm b/legacy/boot.jsm
deleted file mode 100644
index f1cae49..0000000
--- a/legacy/boot.jsm
+++ /dev/null
@@ -1,7 +0,0 @@
-let EXPORTED_SYMBOLS = [];
-
-const {AddonManager} = ChromeUtils.import('resource://gre/modules/AddonManager.jsm');
-if (AddonManager.addExternalExtensionLoader) {
-  const {BootstrapLoader} = ChromeUtils.import('chrome://legacy/content/BootstrapLoader.jsm');
-  AddonManager.addExternalExtensionLoader(BootstrapLoader);
-}
-- 
2.39.3