[popfile-commit] windows installer.nsi,1.138,1.139

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv7832

Modified Files:
	installer.nsi 
Log Message:
Try starting popfile.exe directly instead of via the shortcut. Display message if launch error detected.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** installer.nsi	15 Oct 2003 09:12:28 -0000	1.138
--- installer.nsi	15 Oct 2003 20:40:12 -0000	1.139
***************
*** 2269,2273 ****
    Push ${L_CONSOLE}
    Call SetConsoleMode
!   ExecShell "open" "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile.lnk"
  
    ; Wait until POPFile is ready to display the UI (may take a second or so)
--- 2269,2285 ----
    Push ${L_CONSOLE}
    Call SetConsoleMode
!   SetOutPath $INSTDIR
!   ClearErrors
!   Exec '"$INSTDIR\popfile.exe"'
!   IfErrors 0 continue
!   Banner::destroy
!   MessageBox MB_OK|MB_TOPMOST "An error occurred when the installer tried to start POPFile.\
!       $\r$\n$\r$\n\
!       Please use 'Start -> Programs -> POPFile -> Run POPFile' now.\
!       $\r$\n$\r$\n\
!       Click 'OK' when the 'POPFile Engine v0.20.0 running' message appears."
!   Goto exit_without_banner
!   
! continue:
  
    ; Wait until POPFile is ready to display the UI (may take a second or so)
***************
*** 2370,2374 ****
  Function RunUI
  
!   ExecShell "open" "$SMPROGRAMS\${MUI_PRODUCT}\POPFile User Interface.url"
  
  FunctionEnd
--- 2382,2386 ----
  Function RunUI
  
!   ExecShell "open" '"$SMPROGRAMS\${MUI_PRODUCT}\POPFile User Interface.url"'
  
  FunctionEnd