[lmi-commits] [5414] Presumptively run 'rebaseall' for msw 7 only

[Greg Chicares]

Revision: 5414
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5414
Author:   chicares
Date:     2012-03-01 09:28:16 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Presumptively run 'rebaseall' for msw 7 only

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/install_cygwin.bat

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-03-01 06:19:31 UTC (rev 5413)
+++ lmi/trunk/ChangeLog 2012-03-01 09:28:16 UTC (rev 5414)
@@ -29759,3 +29759,19 @@
 Prefer <X/> to <X></X> for empty elements. See:
   http://lists.nongnu.org/archive/html/lmi/2012-02/msg00013.html
 
+20120229T1043Z <address@hidden> [573]
+
+  install_cygwin.bat
+Always end in a directory known to exist.
+
+20120301T0619Z <address@hidden> [573]
+
+  install_cygwin.bat
+Presumptively run 'rebaseall'. For the nonce, do so regardless of msw
+version, for testing.
+
+20120301T0928Z <address@hidden> [573]
+
+  install_cygwin.bat
+Presumptively run 'rebaseall' for msw 7 only.
+

Modified: lmi/trunk/install_cygwin.bat
===================================================================
--- lmi/trunk/install_cygwin.bat        2012-03-01 06:19:31 UTC (rev 5413)
+++ lmi/trunk/install_cygwin.bat        2012-03-01 09:28:16 UTC (rev 5414)
@@ -53,6 +53,8 @@
   CALL :TryToInstall_1_5
   IF NOT EXIST C:\cygwin\NUL (
     echo Cygwin-1.5 installation seems to have succeeded on iteration %%i
+    ver | findstr /L "6.1."
+    IF ERRORLEVEL 1 GOTO Got_1_5
     cd C:\cygwin-1_5\bin
     C:\cygwin-1_5\bin\ash rebaseall
     echo Cygwin-1.5 rebased
@@ -87,6 +89,8 @@
 echo C:/lmi                    /lmi           lmi_specific binary,user 0 0 >> 
fstab
 echo C:/cache_for_lmi          /cache_for_lmi lmi_specific binary,user 0 0 >> 
fstab
 echo Cygwin-1.7 installation seems to have succeeded
+ver | findstr /L "6.1."
+IF ERRORLEVEL 1 GOTO End
 cd C:\cygwin-1_7\bin
 C:\cygwin-1_7\bin\dash -l -i -c "rebaseall"
 echo Cygwin-1.7 rebased