[lmi-commits] [5116] Do nothing if already installed

[Greg Chicares]

Revision: 5116
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5116
Author:   chicares
Date:     2010-11-04 00:37:15 +0000 (Thu, 04 Nov 2010)
Log Message:
-----------
Do nothing if already installed

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

Modified: lmi/trunk/install_cygwin.bat
===================================================================
--- lmi/trunk/install_cygwin.bat        2010-11-02 01:50:22 UTC (rev 5115)
+++ lmi/trunk/install_cygwin.bat        2010-11-04 00:37:15 UTC (rev 5116)
@@ -1,44 +1,46 @@
-REM Cygwin installation.
-REM
-REM Copyright (C) 2010 Gregory W. Chicares.
-REM
-REM This program is free software; you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License version 2 as
-REM published by the Free Software Foundation.
-REM
-REM This program is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM
-REM You should have received a copy of the GNU General Public License
-REM along with this program; if not, write to the Free Software Foundation,
-REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-REM
-REM http://savannah.nongnu.org/projects/lmi
-REM email: <address@hidden>
-REM snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
address@hidden Cygwin installation.
address@hidden
address@hidden Copyright (C) 2010 Gregory W. Chicares.
address@hidden
address@hidden This program is free software; you can redistribute it and/or 
modify
address@hidden it under the terms of the GNU General Public License version 2 as
address@hidden published by the Free Software Foundation.
address@hidden
address@hidden This program is distributed in the hope that it will be useful,
address@hidden but WITHOUT ANY WARRANTY; without even the implied warranty of
address@hidden MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
address@hidden GNU General Public License for more details.
address@hidden
address@hidden You should have received a copy of the GNU General Public License
address@hidden along with this program; if not, write to the Free Software 
Foundation,
address@hidden Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
address@hidden
address@hidden http://savannah.nongnu.org/projects/lmi
address@hidden email: <address@hidden>
address@hidden snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-REM $Id$
address@hidden $Id$
 
 @ECHO OFF
 
-REM Install both Cygwin-1.5 and Cygwin-1.7 .
-REM
-REM Motivation: in case any problem is encountered with the current version,
-REM it is convenient to have the older version to fall back on.
-REM
-REM Cygwin-1.5's installer appears to be somewhat anomalous. Even when told
-REM to install to a nondefault directory, it creates 'C:\Cygwin' and puts
-REM some files and directories there. Deleting the unwanted directory and
-REM running the installer again decreases the anomaly; repeating those steps
-REM one more time produces an installation that seems to be valid. For the
-REM versions of msw that have been tested, three iterations are necessary, so
-REM for conservatism five are allowed. Postinstall script 'autoconf2.5.sh'
-REM fails because '/usr/share/info/autoconf2.61.info.gz' doesn't exist, but
-REM it's acceptable if only that 'info' page is missing.
address@hidden Install both Cygwin-1.5 and Cygwin-1.7 .
address@hidden
address@hidden Motivation: in case any problem is encountered with the current 
version,
address@hidden it is convenient to have the older version to fall back on.
address@hidden
address@hidden Cygwin-1.5's installer appears to be somewhat anomalous. Even 
when told
address@hidden to install to a nondefault directory, it creates 'C:\Cygwin' and 
puts
address@hidden some files and directories there. Deleting the unwanted 
directory and
address@hidden running the installer again decreases the anomaly; repeating 
those steps
address@hidden one more time produces an installation that seems to be valid. 
For the
address@hidden versions of msw that have been tested, three iterations are 
necessary, so
address@hidden for conservatism five are allowed. Postinstall script 
'autoconf2.5.sh'
address@hidden fails because '/usr/share/info/autoconf2.61.info.gz' doesn't 
exist, but
address@hidden it's acceptable if only that 'info' page is missing.
 
-IF EXIST C:\cygwin\NUL GOTO FoundOldInstallation
+IF EXIST C:\cygwin\NUL     GOTO FoundOldInstallation
+IF EXIST C:\cygwin-1_5\NUL GOTO FoundOldInstallation
+IF EXIST C:\cygwin-1_7\NUL GOTO FoundOldInstallation
 
 C:
 cd C:\cache_for_lmi
@@ -46,17 +48,17 @@
 FOR /L %%i IN (1,1,5) DO (
   CALL :TryToInstall_1_5
   IF NOT EXIST C:\cygwin\NUL (
-    echo "Cygwin 1.5 installation seems to have succeeded on iteration" %%i
+    echo Cygwin-1.5 installation seems to have succeeded on iteration %%i
     GOTO Got_1_5
   )
-  echo "Anomalous 'C:\cygwin' directory present after iteration" %%i
+  echo Anomalous 'C:\cygwin' directory present after iteration %%i
   rmdir /S /Q C:\cygwin
 )
-echo "Failed"
+echo Cygwin-1.5 installation has failed
 GOTO End
 
 :TryToInstall_1_5
-START "Installing Cygwin 1.5" /WAIT setup-legacy ^
+START "Installing Cygwin-1.5" /WAIT setup-legacy ^
   --quiet-mode --no-shortcuts ^
   --site ftp://mirror.mcs.anl.gov/pub/cygwin/ ^
   --root C:/cygwin-1_5 --packages ^
@@ -64,16 +66,16 @@
 GOTO:EOF
 
 :Got_1_5
-START "Installing Cygwin 1.7" /WAIT setup ^
+START "Installing Cygwin-1.7" /WAIT setup ^
   --quiet-mode ^
   --site ftp://mirror.mcs.anl.gov/pub/cygwin/ ^
   --root C:/cygwin-1_7 --packages ^
   cvs,doxygen,gdb,libtool,make,openssh,patch,rsync,subversion,wget,zsh
-echo "Cygwin 1.7 installation seems to have succeeded"
+echo Cygwin-1.7 installation seems to have succeeded
 GOTO End
 
 :FoundOldInstallation
-echo "Directory C:\cygwin was already present"
+echo Cygwin appears already to have been installed
 GOTO End
 
 :End