diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 14:34:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 14:34:26 +0000 |
| commit | bb374231120f129dbf8c511a73073578468e4fe5 (patch) | |
| tree | 7e32f403d2acb6ee8ec214c30a3d8aff8f24fcb1 /setup_native/source/win32/nsis/downloadtemplate.nsi | |
| parent | a41575532a9b9cfacb623b5fe8751098a8950f80 (diff) | |
INTEGRATION: CWS soc (1.6.36); FILE MERGED
2006/03/16 13:12:29 is 1.6.36.1: #133457# setting INSTALLLOCATION also for silent installations
Diffstat (limited to 'setup_native/source/win32/nsis/downloadtemplate.nsi')
| -rw-r--r-- | setup_native/source/win32/nsis/downloadtemplate.nsi | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi b/setup_native/source/win32/nsis/downloadtemplate.nsi index 3c75d64b7c63..edeae48ca8fb 100644 --- a/setup_native/source/win32/nsis/downloadtemplate.nsi +++ b/setup_native/source/win32/nsis/downloadtemplate.nsi @@ -25,7 +25,7 @@ Function .onInit showhelp: MessageBox MB_OK|MB_ICONINFORMATION \ "DOWNLOADNAMEPLACEHOLDER options: $\n $\n \ - /S : Silent information $\n \ + /S : Silent installation $\n \ /D=<path> : NSIS installation directory (must be the last option!) $\n \ /EXTRACTONLY=ON : NSIS only extracts the PRODUCTNAMEPLACEHOLDER PRODUCTVERSIONPLACEHOLDER installation set $\n \ /INSTALLLOCATION=<path> : PRODUCTNAMEPLACEHOLDER PRODUCTVERSIONPLACEHOLDER installation directory $\n \ @@ -267,10 +267,23 @@ Section -Post IfSilent onPostSilent onPostNoSilent onPostSilent: - ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE /qr -ignore_running" - RMDir /r $INSTDIR - RMDir $INSTDIR - GoTo onPostDone + Push $1 + Push "/POSTREMOVE=" + Call GetOptions + Pop $2 + ;MessageBox MB_OK "POSTREMOVE: $2" + + StrCmp $2 "ON" postremovesilent nopostremovesilent + nopostremovesilent: + ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE $3 /qr -ignore_running" + Quit + GoTo onPostDone + postremovesilent: + ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE $3 /qr -ignore_running" + RMDir /r $INSTDIR + RMDir $INSTDIR + Quit + GoTo onPostDone onPostNoSilent: Push $1 |