fix: Downgrading nsis to v3.0.4.1 since v3.0.4.2 throws false virus p…

…ositives (#6334) (#6447)
electron-userland · Nov 26, 2021 · d20bcf0 · d20bcf0
1 parent e95afc1
commit d20bcf0
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 20 deletions.
diff --git a/.changeset/purple-swans-beam.md b/.changeset/purple-swans-beam.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix(nsis): downgrade nsis from v3.0.4.2 to v3.0.4.1 due to (#6334)
diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
@@ -493,11 +493,25 @@
           "description": "Repository slug/name",
           "type": "string"
         },
+        "token": {
+          "description": "The access token to support auto-update from private bitbucket repositories.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
         "updaterCacheDirName": {
           "type": [
             "null",
             "string"
           ]
+        },
+        "username": {
+          "description": "The user name to support auto-update from private bitbucket repositories.",
+          "type": [
+            "null",
+            "string"
+          ]
         }
       },
       "required": [
@@ -525,7 +539,7 @@
           ]
         },
         "version": {
-          "default": "3.0.4.2",
+          "default": "3.0.4.1",
           "type": [
             "null",
             "string"

diff --git a/packages/app-builder-lib/src/targets/nsis/nsisOptions.ts b/packages/app-builder-lib/src/targets/nsis/nsisOptions.ts
@@ -11,14 +11,14 @@ interface CustomNsisBinary {
 
   /**
    * @private
-   * @default o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==
+   * @default VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==
    */
 
   readonly checksum?: string | null
 
   /**
    * @private
-   * @default 3.0.4.2
+   * @default 3.0.4.1
    */
 
   readonly version?: string | null

diff --git a/packages/app-builder-lib/src/targets/nsis/nsisUtil.ts b/packages/app-builder-lib/src/targets/nsis/nsisUtil.ts
@@ -33,8 +33,9 @@ export const NSIS_PATH = () => {
         return getBinFromCustomLoc("nsis", binaryVersion, url, checksum)
       }
     }
+    // Warning: Don't use v3.0.4.2 - https://github.com/electron-userland/electron-builder/issues/6334
     // noinspection SpellCheckingInspection
-    return getBinFromUrl("nsis", "3.0.4.2", "o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==")
+    return getBinFromUrl("nsis", "3.0.4.1", "VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==")
   })
 }
 

diff --git a/test/src/windows/assistedInstallerTest.ts b/test/src/windows/assistedInstallerTest.ts
@@ -117,28 +117,17 @@ test.ifAll.ifNotCiMac("assisted, MUI_HEADER as option", () => {
   )
 })
 
-test.ifNotCiMac(
-  "custom makensis.exe",
+test.skip.ifNotCiMac(
+  "debug logging enabled",
   app({
     targets: nsisTarget,
     config: {
       nsis: {
         customNsisBinary: {
-          url: "https://github.com/electron-userland/electron-builder-binaries/releases/download/nsis-3.0.4.1/nsis-3.0.4.1.7z",
-          version: "3.0.4.1",
-          checksum: "VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==",
+          url: "https://github.com/electron-userland/electron-builder-binaries/releases/download/nsis-3.0.4.2/nsis-3.0.4.2.7z",
+          version: "3.0.4.2",
+          checksum: "o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==",
         },
-      },
-    },
-  })
-)
-
-test.ifNotCiMac(
-  "debug logging enabled",
-  app({
-    targets: nsisTarget,
-    config: {
-      nsis: {
         debugLogging: true,
       },
     },