diff options
| author | Sebastien Blaisot <sebastien@blaisot.org> | 2017-09-16 22:17:35 +0200 |
|---|---|---|
| committer | Sebastien Blaisot <sebastien@blaisot.org> | 2017-09-16 22:17:35 +0200 |
| commit | 2e9475b352f26e53b552c1b902e50f1cd78e2e32 (patch) | |
| tree | c39cfa4a1de9e56afd4230bb48e46c70184a9923 /build/appveyor | |
| parent | 95cd3f7a757c2bd5c5e66d6614cb41a166f3d880 (diff) | |
(appveyor) fix NSIS patch after appveyor NSIS upgrade
Diffstat (limited to 'build/appveyor')
| -rw-r--r-- | build/appveyor/NSIS.patch | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/build/appveyor/NSIS.patch b/build/appveyor/NSIS.patch index cae3d381e6..12e450e186 100644 --- a/build/appveyor/NSIS.patch +++ b/build/appveyor/NSIS.patch @@ -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 |