Skip to content

(appveyor) fix NSIS patch after appveyor NSIS upgrade #1344

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

Merged
daschuer merged 1 commit into from
Sep 16, 2017
Merged

(appveyor) fix NSIS patch after appveyor NSIS upgrade #1344

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
23 changes: 5 additions & 18 deletions build/appveyor/NSIS.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
--- MultiUser.nsh.orig 2016-03-11 19:16:38.000000000 +0000
+++ MultiUser.nsh 2017-01-18 19:43:33.803305800 +0000
@@ -91,7 +91,11 @@
!if "${UNINSTALLER_PREFIX}" != UN
;Set default installation location for installer
!ifdef MULTIUSER_INSTALLMODE_INSTDIR
- StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !ifdef MULTIUSER_USE_PROGRAMFILES64
+ StrCpy $INSTDIR "$PROGRAMFILES64\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !else
+ StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !endif
!endif
!endif

@@ -129,7 +133,11 @@
--- MultiUser.nsh.orig 2017-09-16 20:03:48.000000000 +0000
+++ MultiUser.nsh 2017-09-16 20:14:24.236880542 +0000
@@ -133,7 +133,11 @@
${if} ${AtLeastWin2000}
StrCpy $INSTDIR "$LOCALAPPDATA\${MULTIUSER_INSTALLMODE_INSTDIR}"
${else}
- StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !ifdef MULTIUSER_USE_PROGRAMFILES64
+ !ifdef MULTIUSER_USE_PROGRAMFILES64
+ StrCpy $INSTDIR "$PROGRAMFILES64\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !else
+ StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !endif
+ !endif
${endif}
!endif
!endif