--- doc/install/linux/install.pl 2011/07/21 21:28:33 1.21 +++ doc/install/linux/install.pl 2011/09/20 20:54:47 1.22 @@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log")) &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 @@ sub get_distro { $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 @@ sub check_required { } 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 '') {