doc/install/linux/install.pl - diff

Return to install.pl CVS log

Up to [LON-CAPA] / doc / install / linux

version 1.20, 2011/06/07 15:17:51	version 1.22, 2011/09/20 20:54:47
Line 191 sub get_distro {	Line 191 sub get_distro {
$distro = 'rhes'.$1;	$distro = 'rhes'.$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 =~ /CentOS release (\d+)/) {	} elsif ($versionstring =~ /CentOS(?:\| Linux) release (\d+)/) {
$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 '') {