[LON-CAPA-cvs] cvs: doc /install/linux install.pl loncom/build distprobe

[raeburn]

raeburn		Thu Jul 21 21:28:33 2011 EDT

  Modified files:              
    /loncom/build	distprobe 
    /doc/install/linux	install.pl 
  Log:
  - Support CentOS 6.
  
  
Index: loncom/build/distprobe
diff -u loncom/build/distprobe:1.19 loncom/build/distprobe:1.20
--- loncom/build/distprobe:1.19	Fri May  6 21:29:41 2011
+++ loncom/build/distprobe	Thu Jul 21 21:28:29 2011
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network with CAPA
 #
-# $Id: distprobe,v 1.19 2011/05/06 21:29:41 raeburn Exp $
+# $Id: distprobe,v 1.20 2011/07/21 21:28:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,7 @@
         $dist = 'rhes'.$1;
     } elsif ($versionstring =~ /Red Hat Enterprise Linux Server release (\d+)/) {
         $dist = 'rhes'.$1;
-    } elsif ($versionstring =~ /CentOS release (\d+)/) {
+    } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
         $dist = 'centos'.$1;
     } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
         my $ver = $1;
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.20 doc/install/linux/install.pl:1.21
--- doc/install/linux/install.pl:1.20	Tue Jun  7 15:17:51 2011
+++ doc/install/linux/install.pl	Thu Jul 21 21:28:33 2011
@@ -72,7 +72,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.20 2011/06/07 15:17:51 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.21 2011/07/21 21:28:33 raeburn Exp $'."\n";
 }
 
 #
@@ -191,7 +191,7 @@
             $distro = 'rhes'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /CentOS release (\d+)/) {
+        } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
             $distro = 'centos'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';