[popfile-commit] windows adduser-Version.nsh,1.1,1.2 adduser.nsi,1.73,1.74 installer.nsi,1.255,1.256

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

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29679

Modified Files:
	adduser-Version.nsh adduser.nsi installer.nsi 
Log Message:
No need for the DIRECTORY page's "leave" function to explicitly strip
any trailing slashes from the installation path selected by the user
(NSIS does this automatically when $INSTDIR is used for this page).

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.255
retrieving revision 1.256
diff -C2 -d -r1.255 -r1.256
*** installer.nsi	2 Mar 2005 19:53:41 -0000	1.255
--- installer.nsi	4 Mar 2005 02:00:31 -0000	1.256
***************
*** 1735,1740 ****
  # (the "leave" function for the POPFile PROGRAM DIRECTORY selection page)
  #
! # Now that we are overriding the default InstallDir behaviour, we really need to check
! # that the main 'Program Files' folder has not been selected for the installation.
  #
  # This function is used to check if a previous POPFile installation exists in the directory
--- 1735,1744 ----
  # (the "leave" function for the POPFile PROGRAM DIRECTORY selection page)
  #
! # The POPFile PROGRAM DIRECTORY page uses the standard $INSTDIR variable so NSIS
! # automatically strips any trailing backslashes from the path selected by the user.
! #
! # Now that we are overriding the default 'InstallDir' behaviour it is easier for the
! # user to select the main 'Program Files' folder so we check for this case and refuse
! # to accept this path.
  #
  # This function is used to check if a previous POPFile installation exists in the directory
***************
*** 1750,1758 ****
    Push ${L_RESULT}
  
-   ; Strip trailing slashes (if any) from the path selected by the user
- 
-   Push $INSTDIR
-   Pop $INSTDIR
- 
    ; We do not permit POPFile to be installed in the target system's 'Program Files' folder
    ; (i.e. we do not allow 'popfile.pl' etc to be stored there)
--- 1754,1757 ----

Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** adduser-Version.nsh	2 Mar 2005 19:50:18 -0000	1.1
--- adduser-Version.nsh	4 Mar 2005 02:00:30 -0000	1.2
***************
*** 7,11 ****
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.69"
  
  #--------------------------------------------------------------------------
--- 7,11 ----
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.70"
  
  #--------------------------------------------------------------------------

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** adduser.nsi	2 Mar 2005 19:50:18 -0000	1.73
--- adduser.nsi	4 Mar 2005 02:00:31 -0000	1.74
***************
*** 1999,2004 ****
  # (the "leave" function for the DIRECTORY page)
  #
! # Now that we are overriding the default InstallDir behaviour, we really need to check
! # that the main 'Program Files' folder has not been selected for the 'User Data' folder.
  #
  # POPFile currently does not support paths containing spaces in POPFILE_ROOT and POPFILE_USER
--- 1999,2008 ----
  # (the "leave" function for the DIRECTORY page)
  #
! # The DIRECTORY page uses the standard $INSTDIR variable so NSIS automatically strips
! # any trailing backslashes from the path selected by the user.
! #
! # Now that we are overriding the default 'InstallDir' behaviour it is easier for the
! # user to select the main 'Program Files' folder so we check for this case and refuse
! # to accept this path.
  #
  # POPFile currently does not support paths containing spaces in POPFILE_ROOT and POPFILE_USER
***************
*** 2015,2022 ****
    Push ${L_RESULT}
  
!   ; Strip trailing slashes (if any) from the path selected by the user
  
-   Push $INSTDIR
-   Pop $INSTDIR
    StrCpy $G_USERDIR "$INSTDIR"
  
--- 2019,2024 ----
    Push ${L_RESULT}
  
!   ; Get the 'clean' version of the path selected by the user (no trailing backslashes)
  
    StrCpy $G_USERDIR "$INSTDIR"