[popfile-commit] windows installer.nsi,1.63,1.64

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

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

Modified Files:
	installer.nsi 
Log Message:
Improved the progress reporting performed by the installer and uninstaller.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** installer.nsi	14 Jun 2003 17:22:47 -0000	1.63
--- installer.nsi	14 Jun 2003 19:39:20 -0000	1.64
***************
*** 542,545 ****
--- 542,546 ----
    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}
***************
*** 552,555 ****
--- 553,557 ----
    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
***************
*** 882,890 ****
    ; value of 1 is found, we need to look for its OE email account data in
    ;
!   ;     HK_CURRENT_USER\Software\Microsoft\Internet Account Manager\Accounts
    ;
    ; otherwise we look in the GUID's entry in HKEY_CURRENT_USER\Identities, using the path
    ;
!   ;     HK_CURRENT_USER\Identities\{GUID}\Software\Microsoft\Internet Account Manager\Accounts
  
    ; All of the OE account data for an identity appears "under" the path defined
--- 884,892 ----
    ; value of 1 is found, we need to look for its OE email account data in
    ;
!   ;     HKEY_CURRENT_USER\Software\Microsoft\Internet Account Manager\Accounts
    ;
    ; otherwise we look in the GUID's entry in HKEY_CURRENT_USER\Identities, using the path
    ;
!   ;     HKEY_CURRENT_USER\Identities\{GUID}\Software\Microsoft\Internet Account Manager\Accounts
  
    ; All of the OE account data for an identity appears "under" the path defined
***************
*** 1104,1108 ****
  
    !insertmacro MUI_HEADER_TEXT "POPFile is now ready for use" \
!                                "POPFile and its User Interface can be started now, if required"
  
    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioC.ini"
--- 1106,1110 ----
  
    !insertmacro MUI_HEADER_TEXT "POPFile is now ready for use" \
!                "The POPFile User Interface only works if POPFile has been started"
  
    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioC.ini"
***************
*** 1156,1160 ****
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "DOS-box"
  
!   Banner::show /NOUNLOAD /set 76 "Preparing to start POPFile now." "Please be patient..."
  
    ; Before starting the newly installed POPFile, ensure that no other version of POPFile
--- 1158,1162 ----
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "DOS-box"
  
!   Banner::show /NOUNLOAD /set 76 "Preparing to start POPFile." "This may take a few seconds..."
  
    ; Before starting the newly installed POPFile, ensure that no other version of POPFile
***************
*** 1175,1179 ****
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "background"
  
!   Banner::show /NOUNLOAD /set 76 "Preparing to start POPFile now." "Please be patient..."
  
    ; Before starting the newly installed POPFile, ensure that no other version of POPFile
--- 1177,1181 ----
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "background"
  
!   Banner::show /NOUNLOAD /set 76 "Preparing to start POPFile." "This may take a few seconds..."
  
    ; Before starting the newly installed POPFile, ensure that no other version of POPFile
***************
*** 1526,1529 ****
--- 1528,1532 ----
          directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)" IDYES skip_confirmation
      Abort "Uninstall aborted by user"
+ 
  skip_confirmation:
  
***************
*** 1554,1557 ****
--- 1557,1561 ----
    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}
***************
*** 1578,1583 ****
--- 1582,1589 ----
    ; Read the registry settings found in popfile.reg and restore them
    ; it there are any.   All are assumed to be in HKCU
+   
    FileOpen ${CFG} $INSTDIR\popfile.reg r
    IfErrors skip_registry_restore
+   
  restore_loop:
    FileRead ${CFG} ${L_REG_KEY}
***************
*** 1597,1600 ****
--- 1603,1607 ----
    IfErrors skip_registry_restore
    WriteRegStr HKCU ${L_REG_KEY} ${L_REG_SUBKEY} ${L_REG_VALUE}
+   DetailPrint "Restored ${L_REG_SUBKEY}: ${L_REG_VALUE}"
    goto restore_loop
  
***************
*** 1672,1682 ****
--- 1679,1692 ----
  
    ; if $INSTDIR was removed, skip these next ones
+   
    IfFileExists $INSTDIR 0 Removed
      MessageBox MB_YESNO|MB_ICONQUESTION \
        "Do you want to remove all files in your POPFile directory? (If you have anything \
        you created that you want to keep, click No)" IDNO Removed
+     DetailPrint "Removing all files from POPFile directory"
      Delete $INSTDIR\*.* ; this would be skipped if the user hits no
      RMDir /r $INSTDIR
      IfFileExists $INSTDIR 0 Removed
+       DetailPrint "Note: unable to remove all files from POPFile directory"
        MessageBox MB_OK|MB_ICONEXCLAMATION \
                   "Note: $INSTDIR could not be removed."