From 895411f17bda594224918b69cb0810785bbed599 Mon Sep 17 00:00:00 2001 From: Adam Ulvi Date: Mon, 7 Nov 2016 22:08:12 -0800 Subject: [PATCH] feat(nsis): Specify install dir based on architecture (#889) --- templates/nsis/multiUser.nsh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/nsis/multiUser.nsh b/templates/nsis/multiUser.nsh index f1f1c04a375..01df12146d2 100644 --- a/templates/nsis/multiUser.nsh +++ b/templates/nsis/multiUser.nsh @@ -51,6 +51,12 @@ Var installMode StrCpy $INSTDIR "$PROGRAMFILES\${PRODUCT_FILENAME}\${VERSION}" + !ifdef APP_64 + ${if} ${RunningX64} + StrCpy $INSTDIR "$PROGRAMFILES64\${PRODUCT_FILENAME}\${VERSION}" + ${endif} + !endif + # сhecks registry for previous installation path — for uninstall only, currently, installation path is not customizable ReadRegStr $perMachineInstallationFolder HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation !ifdef BUILD_UNINSTALLER @@ -59,4 +65,4 @@ Var installMode ${endif} !endif !macroend -!endif \ No newline at end of file +!endif