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

[raeburn]

raeburn		Tue Sep 20 20:54:48 2011 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - correct regexp for Scientific Linux 6.
  - return $updatecmd if LONCAPA-prerequisites missing.
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.21 doc/install/linux/install.pl:1.22
--- doc/install/linux/install.pl:1.21	Thu Jul 21 21:28:33 2011
+++ doc/install/linux/install.pl	Tue Sep 20 20:54:47 2011
@@ -72,7 +72,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.21 2011/07/21 21:28:33 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.22 2011/09/20 20:54:47 raeburn Exp $'."\n";
 }
 
 #
@@ -195,7 +195,7 @@
             $distro = 'centos'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /Scientific Linux (SL )?release ([\d.]+) /) {
+        } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
             my $ver = $1;
             $ver =~ s/\.\d+$//;
             $distro = 'scientific'.$ver;
@@ -357,7 +357,7 @@
     }
     my $gotprereqs = &check_prerequisites($packagecmd,$distro); 
     if ($gotprereqs eq '') {
-        return ($distro,$gotprereqs);
+        return ($distro,$gotprereqs,'',$packagecmd,$updatecmd);
     }
     my $localecmd = &check_locale($distro);
     unless ($localecmd eq '') {