Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv16651
Modified Files:
installer.nsi
Log Message:
Further improvements to installer/uninstaller progress reports.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** installer.nsi 14 Jun 2003 23:43:41 -0000 1.66
--- installer.nsi 15 Jun 2003 11:48:52 -0000 1.67
***************
*** 543,547 ****
StrCmp ${L_OLD_GUI} "" try_other_port
! DetailPrint "Shutting down previous version of POPFile..."
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT}
--- 543,547 ----
StrCmp ${L_OLD_GUI} "" try_other_port
! DetailPrint "Shutting down previous version of POPFile using port ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT}
***************
*** 554,558 ****
StrCmp ${L_NEW_GUI} "" exit_now
! DetailPrint "Shutting down previous version of POPFile..."
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Ignore the result
--- 554,558 ----
StrCmp ${L_NEW_GUI} "" exit_now
! DetailPrint "Shutting down previous version of POPFile using port ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Ignore the result
***************
*** 1558,1562 ****
Pop ${GUI}
StrCmp ${GUI} "" skip_shutdown
! DetailPrint "Shutting down POPFile..."
NSISdl::download_quiet http://127.0.0.1:${GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
--- 1558,1562 ----
Pop ${GUI}
StrCmp ${GUI} "" skip_shutdown
! DetailPrint "Shutting down POPFile using port ${GUI}"
NSISdl::download_quiet http://127.0.0.1:${GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
***************
*** 1581,1584 ****
--- 1581,1586 ----
Delete $INSTDIR\popfile.cfg
+ IfFileExists "$INSTDIR\popfile.reg" 0 no_reg_file
+
; Read the registry settings found in popfile.reg and restore them
; it there are any. All are assumed to be in HKCU
***************
*** 1587,1590 ****
--- 1589,1593 ----
FileOpen ${CFG} $INSTDIR\popfile.reg r
IfErrors skip_registry_restore
+ DetailPrint "Opened: popfile.reg"
restore_loop:
***************
*** 1610,1615 ****
--- 1613,1620 ----
skip_registry_restore:
FileClose ${CFG}
+ DetailPrint "Closed: popfile.reg"
Delete $INSTDIR\popfile.reg
+ no_reg_file:
Delete $INSTDIR\Platform\*.pm
Delete $INSTDIR\Platform\*.dll
|
