summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorGerd Weiss <gm@openoffice.org>2007-05-10 10:05:41 +0000
committerGerd Weiss <gm@openoffice.org>2007-05-10 10:05:41 +0000
commitb7090a494263d4ff6d54b9da231c91a8d7e5efa5 (patch)
treef2ebb42505d3d4e2f571df15cae073a1a9d53a45 /setup_native
parent3555a63bb6a9159e4e01caad9cab4cdbe50937d7 (diff)
INTEGRATION: CWS native82 (1.7.86); FILE MERGED
2007/05/04 10:24:43 is 1.7.86.2: #i75394# return values also for nsis 2007/05/04 09:51:03 is 1.7.86.1: #i75394# return values also for nsis
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/nsis/downloadtemplate.nsi9
1 files changed, 6 insertions, 3 deletions
diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi b/setup_native/source/win32/nsis/downloadtemplate.nsi
index edeae48ca8fb..6da17b90c2e2 100644
--- a/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -275,13 +275,15 @@ Section -Post
StrCmp $2 "ON" postremovesilent nopostremovesilent
nopostremovesilent:
- ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE $3 /qr -ignore_running"
+ ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE $3 /qr -ignore_running" $0
+ SetErrorLevel $0
Quit
GoTo onPostDone
postremovesilent:
- ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE $3 /qr -ignore_running"
+ ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE $3 /qr -ignore_running" $0
RMDir /r $INSTDIR
RMDir $INSTDIR
+ SetErrorLevel $0
Quit
GoTo onPostDone
@@ -298,9 +300,10 @@ Section -Post
Quit
GoTo onPostDone
postremove:
- ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE $3"
+ ExecWait "$INSTDIR\setup.exe -lang $LANGUAGE $3" $0
RMDir /r $INSTDIR
RMDir $INSTDIR
+ SetErrorLevel $0
Quit
GoTo onPostDone