[popfile-commit] windows stop_popfile.nsi,1.3,1.4

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

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

Modified Files:
	stop_popfile.nsi 
Log Message:
Take action when default REPORT option is supplied (instead of assuming it is the default).

Index: stop_popfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** stop_popfile.nsi	18 Sep 2003 14:33:15 -0000	1.3
--- stop_popfile.nsi	19 Sep 2003 11:34:45 -0000	1.4
***************
*** 29,33 ****
  #
  # There is also an optional parameter which selects the reporting mode:
! # /SHOWERRORS, /SHOWALL or /NONE. (/NONE is used as the default if no mode is supplied)
  #
  # If '/SHOWERRORS' is specified then a message will be shown if any errors were detected
--- 29,33 ----
  #
  # There is also an optional parameter which selects the reporting mode:
! # /SHOWERRORS, /SHOWALL or /SHOWNONE. (/SHOWNONE is used as the default if no mode is supplied)
  #
  # If '/SHOWERRORS' is specified then a message will be shown if any errors were detected
***************
*** 36,40 ****
  # If '/SHOWALL' is specified then a success/fail message will always be shown.
  #
! # If '/NONE' is specified then no messages are displayed.
  #
  # Uppercase or lowercase can be used for this optional parameter.
--- 36,40 ----
  # If '/SHOWALL' is specified then a success/fail message will always be shown.
  #
! # If '/SHOWNONE' is specified then no messages are displayed.
  #
  # Uppercase or lowercase can be used for this optional parameter.
***************
*** 73,77 ****
    Caption "POPFile Silent Shutdown Utility"
  
!   !define VERSION   "0.4.1"       ; see 'VIProductVersion' comment below for format details
  
    ; Specify EXE filename and icon for the 'installer'
--- 73,77 ----
    Caption "POPFile Silent Shutdown Utility"
  
!   !define VERSION   "0.4.2"       ; see 'VIProductVersion' comment below for format details
  
    ; Specify EXE filename and icon for the 'installer'
***************
*** 116,120 ****
    !define L_TEMP     $R5
  
!   StrCpy ${L_REPORT} "none"               ; default is to display no success or failure messages
  
    ; It does not matter if the command-line parameters are uppercase or lowercase
--- 116,120 ----
    !define L_TEMP     $R5
  
!   StrCpy ${L_REPORT} "none"        ; default is to display no success or failure messages
  
    ; It does not matter if the command-line parameters are uppercase or lowercase
***************
*** 142,146 ****
    StrCmp ${L_RESULT} "/showerrors" only_errors
    StrCmp ${L_RESULT} "/showall" all_cases
!   StrCmp ${L_RESULT} "/none" other_param
    StrCmp ${L_RESULT} "/?" usage
    StrCmp ${L_RESULT} "/help" usage
--- 142,146 ----
    StrCmp ${L_RESULT} "/showerrors" only_errors
    StrCmp ${L_RESULT} "/showall" all_cases
!   StrCmp ${L_RESULT} "/shownone" no_messages
    StrCmp ${L_RESULT} "/?" usage
    StrCmp ${L_RESULT} "/help" usage
***************
*** 159,163 ****
      and the optional <REPORT> is /SHOWERRORS (only error messages shown), /SHOWALL\
      $\r$\n\
!     (success or error messages always shown), or /NONE (no messages - this is the default).\
      $\r$\n$\r$\n\
      A success/fail error code is always returned which can be checked in a batch file:\
--- 159,163 ----
      and the optional <REPORT> is /SHOWERRORS (only error messages shown), /SHOWALL\
      $\r$\n\
!     (success or error messages always shown), or /SHOWNONE (no messages - this is the default).\
      $\r$\n$\r$\n\
      A success/fail error code is always returned which can be checked in a batch file:\
***************
*** 174,177 ****
--- 174,181 ----
      Distributed under the terms of the GNU General Public License (GPL)."
    Goto error_exit
+ 
+ no_messages:
+   StrCpy ${L_REPORT} "none"
+   Goto other_param
  
  only_errors: