fix ublock origin extension by using chromium zip instead of firefox

AgregoreWeb · May 18, 2023 · 4bf5aa2 · 4bf5aa2
1 parent c5002ea
commit 4bf5aa2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/app/extensions/builtins.json b/app/extensions/builtins.json
@@ -18,6 +18,7 @@
   "ublock": {
     "version": "1.47.4",
     "comment": "The chrome one has a weird subfolder so we're loading the raw firefox version instead",
-    "url": "https://github.com/gorhill/uBlock/releases/download/{version}/uBlock0_{version}.firefox.signed.xpi"
+    "url": "https://github.com/gorhill/uBlock/releases/download/{version}/uBlock0_{version}.chromium.zip",
+    "stripPrefix": "uBlock0.chromium/"
   }
 }
diff --git a/app/extensions/index.js b/app/extensions/index.js
@@ -122,7 +122,16 @@ export class Extensions extends EventEmitter {
     if (!isNew) return false
     const zipLocation = path.join(this.builtinsLocation, `${name}.zip`)
     const extensionLocation = path.join(this.storageLocation, name)
-    await decompress(zipLocation, extensionLocation)
+    const decompressOptions = {}
+    if (info.stripPrefix) {
+      decompressOptions.map = (file) => {
+        if (file.path.startsWith(info.stripPrefix)) {
+          file.path = file.path.slice(info.stripPrefix.length)
+        }
+        return file
+      }
+    }
+    await decompress(zipLocation, extensionLocation, decompressOptions)
     return true
   }
 

diff --git a/app/index.js b/app/index.js
@@ -126,7 +126,7 @@ async function onready () {
   ])
   // Call this again for Linux because we modified the context menu
   appIcon.setContextMenu(contextMenu)
-  appIcon.on('click',() => {
+  appIcon.on('click', () => {
     createWindow()
   })