From 0fcef13ab8ee947c1cb472407cbfe891a55043ad Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 6 Oct 2011 18:50:31 -0400 Subject: SH-2515 WIP --- indra/newview/installers/windows/installer_template.nsi | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 1b07961e1c..fcc187dc6f 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -505,6 +505,7 @@ Push $2 ; If uninstalling a normal install remove everything ; Otherwise (preview/dmz etc) just remove cache + MessageBox MB_OK 'RM_ALL points at "$2\Application Data\SecondLife"' StrCmp $INSTFLAGS "" RM_ALL RM_CACHE RM_ALL: RMDir /r "$2\Application Data\SecondLife" @@ -957,16 +958,16 @@ ExecWait '"$PROGRAMFILES\SecondLifeViewer2\uninst.exe" /S' ; to take _? argument which combined with ExecWait would avoid need ; for this, but have not been able to get it to work. SPIN_LOOP: -Sleep 500 -IntOp $0 $0 + 500 -IntCmp $0 10000 SLV2_TIMEOUT CONT SLV2_TIMEOUT + Sleep 500 + IntOp $0 $0 + 500 + IntCmp $0 10000 SLV2_TIMEOUT CONT SLV2_TIMEOUT SLV2_TIMEOUT: -MsgBox MB_OK "Error in uninstall" -Goto SLV2_DONE +;; MessageBox /SD IDOK MB_OK "Error in uninstall of Second Life Viewer 2" + Goto SLV2_DONE CONT: -; Do we know this is the last file removed? -IfFileExists "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" SPIN_LOOP SLV2_DONE + ; Do we know this is the last file removed? + IfFileExists "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" SPIN_LOOP SLV2_DONE SLV2_DONE: MessageBox MB_OK "Restoring Cache Files" -- cgit v1.2.3