fix(nsis): allow use dot in the productName

Close #2291
electron-userland · Jan 30, 2018 · 67305af · 67305af
1 parent 5b71f6d
commit 67305af
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/packages/electron-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/electron-builder-lib/src/targets/nsis/NsisTarget.ts
@@ -133,7 +133,7 @@ export class NsisTarget extends Target {
       APP_GUID: guid,
       PRODUCT_NAME: appInfo.productName,
       PRODUCT_FILENAME: appInfo.productFilename,
-      APP_FILENAME: (!oneClick || options.perMachine === true) && /^[-_+0-9a-zA-Z ]+$/.test(appInfo.productFilename) ? appInfo.productFilename : appInfo.sanitizedName,
+      APP_FILENAME: (!oneClick || options.perMachine === true) && /^[-_+0-9a-zA-Z .]+$/.test(appInfo.productFilename) ? appInfo.productFilename : appInfo.sanitizedName,
       APP_DESCRIPTION: appInfo.description,
       VERSION: appInfo.version,
 

diff --git a/packages/electron-builder-lib/templates/nsis/common.nsh b/packages/electron-builder-lib/templates/nsis/common.nsh
@@ -85,17 +85,4 @@ Name "${PRODUCT_NAME}"
   ${endif}
 
   ${StdUtils.ExecShellAsUser} $0 "$launchLink" "open" "$startAppArgs"
-!macroend
-
-!ifndef BUILD_UNINSTALLER
-  Var isTryToKeepShortcuts
-
-  !macro setIsTryToKeepShortcuts
-    StrCpy $isTryToKeepShortcuts "true"
-    !ifdef allowToChangeInstallationDirectory
-      ${ifNot} ${isUpdated}
-        StrCpy $isTryToKeepShortcuts "false"
-      ${endIf}
-    !endif
-  !macroend
-!endif
+!macroend
diff --git a/packages/electron-builder-lib/templates/nsis/include/installer.nsh b/packages/electron-builder-lib/templates/nsis/include/installer.nsh
@@ -235,3 +235,14 @@
     ${endIf}
   !endif
 !macroend
+
+Var /GLOBAL isTryToKeepShortcuts
+
+!macro setIsTryToKeepShortcuts
+  StrCpy $isTryToKeepShortcuts "true"
+  !ifdef allowToChangeInstallationDirectory
+    ${ifNot} ${isUpdated}
+      StrCpy $isTryToKeepShortcuts "false"
+    ${endIf}
+  !endif
+!macroend