version 1.13, 2017/06/05 21:06:25
|
version 1.15, 2019/07/02 19:40:27
|
Line 112 if ($dist =~ /^fedora(\d+)$/) {
|
Line 112 if ($dist =~ /^fedora(\d+)$/) {
|
key => 'gpgkey=', |
key => 'gpgkey=', |
value => $gpg, |
value => $gpg, |
}],$nobackup); |
}],$nobackup); |
} elsif ($dist =~ /^(rhes|centos|scientific)(\d+)$/) { |
} elsif ($dist =~ /^(rhes|centos|scientific|oracle)(\d+)$/) { |
my $type = $1; |
my $type = $1; |
my $ver = $2; |
my $ver = $2; |
my $longver = $ver; |
my $longver = $ver; |
Line 142 if ($dist =~ /^fedora(\d+)$/) {
|
Line 142 if ($dist =~ /^fedora(\d+)$/) {
|
gpg => 'versions/scientific/RPM-GPG-KEY-loncapa', |
gpg => 'versions/scientific/RPM-GPG-KEY-loncapa', |
gpgchk => 1, |
gpgchk => 1, |
}, |
}, |
|
oracle => { |
|
title => 'Oracle Linux', |
|
path => 'oracle/loncapa', |
|
gpg => 'versions/oracle/RPM-GPG-KEY-loncapa', |
|
gpgchk => 1, |
|
}, |
); |
); |
if (ref($info{$type}) eq 'HASH') { |
if (ref($info{$type}) eq 'HASH') { |
if ($ver > 4) { |
if ($ver > 4) { |
Line 200 if ($dist =~ /^fedora(\d+)$/) {
|
Line 206 if ($dist =~ /^fedora(\d+)$/) {
|
regexp => '\s*deb\s+'.$loninst_re.'/ubuntu/\s+hardy\s+main', |
regexp => '\s*deb\s+'.$loninst_re.'/ubuntu/\s+hardy\s+main', |
text => "deb $loninst/ubuntu/ hardy main", |
text => "deb $loninst/ubuntu/ hardy main", |
}, |
}, |
|
ubuntu10 => { |
|
regexp => '\s*deb\s+'.$loninst_re.'/ubuntu/\s+lucid\s+main', |
|
text => "deb $loninst/ubuntu/ lucid main", |
|
}, |
|
ubuntu12 => { |
|
regexp => '\s*deb\s+'.$loninst_re.'/ubuntu/\s+precise\s+main', |
|
text => "deb $loninst/ubuntu/ precise main", |
|
}, |
|
ubuntu14 => { |
|
regexp => '\s*deb\s+'.$loninst_re.'/ubuntu/\s+trusty\s+main', |
|
text => "deb $loninst/ubuntu/ trusty main", |
|
}, |
|
ubuntu16 => { |
|
regexp => '\s*deb\s+'.$loninst_re.'/ubuntu/\s+xenial\s+main', |
|
text => "deb $loninst/ubuntu/ xenial main", |
|
}, |
|
ubuntu18 => { |
|
regexp => '\s*deb\s+'.$loninst_re.'/ubuntu/\s+bionic\s+main', |
|
text => "deb $loninst/ubuntu/ bionic main", |
|
}, |
); |
); |
my $apt_status; |
my $apt_status; |
if (defined($apt_get_source{$dist})) { |
if (defined($apt_get_source{$dist})) { |