fix(msi): Msi target separates files and subdirectories into differen…

…t directories Close #2272
electron-userland · Apr 27, 2018 · 7f75b45 · 7f75b45
1 parent eb6e01a
commit 7f75b45
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/packages/electron-builder-lib/src/targets/MsiTarget.ts b/packages/electron-builder-lib/src/targets/MsiTarget.ts
@@ -189,10 +189,10 @@ export default class MsiTarget extends Target {
         // This syntax is a shortcut to defining each directory in an individual Directory element.
         dirName = packagePath.substring(0, lastSlash)
         // add U (user) suffix just to be sure that will be not overwrite system WIX directory ids.
-        directoryId = `${dirName.toLowerCase()}_u`
+        directoryId = dirName.replace(path.sep === "/" ? /\//g : /\\/g, "_")
         if (!dirNames.has(dirName)) {
           dirNames.add(dirName)
-          dirs.push(`<Directory Id="${directoryId}" Name="${ROOT_DIR_ID}:\\${dirName}\\"/>`)
+          dirs.push(`<Directory Id="${directoryId}" Name="${ROOT_DIR_ID}:\\${dirName.replace(/\//g, "\\")}\\"/>`)
         }
       }
       else if (!isRootDirAddedToRemoveTable) {

diff --git a/test/out/windows/__snapshots__/msiTest.js.snap b/test/out/windows/__snapshots__/msiTest.js.snap
@@ -24,6 +24,18 @@ Object {
 }
 `;
 
+exports[`msi no asar 1`] = `
+Object {
+  "win": Array [
+    Object {
+      "arch": "x64",
+      "file": "Test MSI-1.1.0.msi",
+      "safeArtifactName": "TestApp-1.1.0.msi",
+    },
+  ],
+}
+`;
+
 exports[`per-user 1`] = `
 Object {
   "win": Array [

diff --git a/test/src/windows/msiTest.ts b/test/src/windows/msiTest.ts
@@ -14,6 +14,20 @@ test.ifAll.ifDevOrWinCi("msi", app({
   // signed: true,
 }))
 
+test.ifAll.ifDevOrWinCi("msi no asar", app({
+  targets: Platform.WINDOWS.createTarget("msi"),
+  config: {
+    appId: "build.electron.test.msi.oneClick.perMachine",
+    extraMetadata: {
+      // version: "1.0.0",
+    },
+    productName: "Test MSI",
+    asar: false,
+  }
+}, {
+  // signed: true,
+}))
+
 test.ifAll.ifDevOrWinCi("per-user", app({
   targets: Platform.WINDOWS.createTarget("msi"),
   config: {