version 1.18, 2011/05/31 03:06:20
|
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 '') { |
Line 500 sub chkconfig {
|
Line 500 sub chkconfig {
|
my $nrlstr = join('',@norunlevels); |
my $nrlstr = join('',@norunlevels); |
foreach my $type ('apache','mysql','ntp','cups','memcached') { |
foreach my $type ('apache','mysql','ntp','cups','memcached') { |
my $service = $daemon{$type}; |
my $service = $daemon{$type}; |
|
if ($type eq 'ntp') { |
|
if ($distro =~ /^(?:fedora)(\d+)/) { |
|
my $version = $1; |
|
if ($version >= 15) { |
|
if (!-l "/etc/systemd/system/multi-user.target.wants/ntpd.service") { |
|
$needfix{$type} = 'systemctl enable ntpd.service'; |
|
} |
|
next; |
|
} |
|
} |
|
} |
my $command = $checker_bin.' --list '.$service.' 2>/dev/null'; |
my $command = $checker_bin.' --list '.$service.' 2>/dev/null'; |
if ($type eq 'cups') { |
if ($type eq 'cups') { |
if ($distro =~ /^(?:debian|ubuntu)(\d+)/) { |
if ($distro =~ /^(?:debian|ubuntu)(\d+)/) { |
Line 1211 if ($callsub{'download'}) {
|
Line 1222 if ($callsub{'download'}) {
|
print &mt('The most recent LON-CAPA release is version: [_1].',$production)."\n". |
print &mt('The most recent LON-CAPA release is version: [_1].',$production)."\n". |
&mt('Download the production release? ~[Y/n~]'); |
&mt('Download the production release? ~[Y/n~]'); |
if (&get_user_selection(1)) { |
if (&get_user_selection(1)) { |
$sourcetarball = $production.'tar.gz'; |
$sourcetarball = 'loncapa-'.$production.'.tar.gz'; |
} |
} |
} |
} |
} elsif ($filetouse ne '') { |
} elsif ($filetouse ne '') { |