version 1.21, 2011/07/21 21:28:33
|
version 1.22, 2011/09/20 20:54:47
|
Line 195 sub get_distro {
|
Line 195 sub get_distro {
|
$distro = 'centos'.$1; |
$distro = 'centos'.$1; |
$updatecmd = 'yum install LONCAPA-prerequisites'; |
$updatecmd = 'yum install LONCAPA-prerequisites'; |
$installnow = 'yum -y 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; |
my $ver = $1; |
$ver =~ s/\.\d+$//; |
$ver =~ s/\.\d+$//; |
$distro = 'scientific'.$ver; |
$distro = 'scientific'.$ver; |
Line 357 sub check_required {
|
Line 357 sub check_required {
|
} |
} |
my $gotprereqs = &check_prerequisites($packagecmd,$distro); |
my $gotprereqs = &check_prerequisites($packagecmd,$distro); |
if ($gotprereqs eq '') { |
if ($gotprereqs eq '') { |
return ($distro,$gotprereqs); |
return ($distro,$gotprereqs,'',$packagecmd,$updatecmd); |
} |
} |
my $localecmd = &check_locale($distro); |
my $localecmd = &check_locale($distro); |
unless ($localecmd eq '') { |
unless ($localecmd eq '') { |