Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(nsis): Specify Windows install directory based on architecture #889

Merged
merged 1 commit into from
Nov 8, 2016
Merged

feat(nsis): Specify Windows install directory based on architecture #889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion templates/nsis/multiUser.nsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -59,4 +65,4 @@ Var installMode
${endif}
!endif
!macroend
!endif
!endif