Fix Installer for 64-bit fails with argument "/D"

notepad-plus-plus · Oct 31, 2016 · 80092ea · SinghRajenM · Nov 4, 2016 · SinghRajenM
1 parent c58043e
commit 80092ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
@@ -96,8 +96,6 @@ Function .onInit
 	${If} ${RunningX64}
 		; disable registry redirection (enable access to 64-bit portion of registry)
 		SetRegView 64
-		; change install dir 
-		StrCpy $INSTDIR "$PROGRAMFILES64\${APPNAME}"
 
 		; check if 32-bit version has been installed if yes, ask user to remove it
 		IfFileExists $PROGRAMFILES\${APPNAME}\notepad++.exe 0 noDelete32

diff --git a/PowerEditor/installer/nsisInclude/gobalDef.nsh b/PowerEditor/installer/nsisInclude/gobalDef.nsh
@@ -42,5 +42,11 @@
 
 ; Main Install settings
 Name "${APPNAMEANDVERSION}"
+
+!ifdef ARCH64
+InstallDir "$PROGRAMFILES64\${APPNAME}"
+!else
 InstallDir "$PROGRAMFILES\${APPNAME}"
+!endif
+
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -29,7 +29,6 @@ Var UPDATE_PATH
 Function setPathAndOptions
 	; Set Section properties
 	SetOverwrite on
-
 	StrCpy $UPDATE_PATH $INSTDIR
 
 	SetOutPath "$INSTDIR\"