summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-07-02 14:26:32 +0200
committerRemi Collet <remi@remirepo.net>2021-07-02 14:26:32 +0200
commit79d4c3491e42d75dd3dcb3203358c1ed3305daef (patch)
tree9480cff2492d63d967a3ae8a504fe66bb9147735
parent5410856ff92f5f6a57fd542c9bf87d70dda0956f (diff)
Wizard: improve OS list
-rw-r--r--wizard/index.php44
1 files changed, 17 insertions, 27 deletions
diff --git a/wizard/index.php b/wizard/index.php
index 41a56c54..bda970c7 100644
--- a/wizard/index.php
+++ b/wizard/index.php
@@ -17,10 +17,8 @@ define('COUNTER', __DIR__ . "/counter.txt");
$osvers = [
'RHEL 8' => ['7.2','7.3', '7.4'],
'RHEL 7' => '5.4',
-// 'RHEL 6' => '5.3',
'CentOS 8' => ['7.2','7.3', '7.4'],
'CentOS 7' => '5.4',
-// 'CentOS 6' => '5.3',
'Fedora 34' => '7.4',
'Fedora 33' => '7.4',
'Fedora 32' => '7.4',
@@ -28,10 +26,8 @@ $osvers = [
$osmin = [
'RHEL 8' => '5.6',
'RHEL 7' => '5.4',
-// 'RHEL 6' => '5.4',
'CentOS 8' => '5.6',
'CentOS 7' => '5.4',
-// 'CentOS 6' => '5.4',
'Fedora 34' => '5.6',
'Fedora 33' => '5.6',
'Fedora 32' => '5.6',
@@ -39,30 +35,23 @@ $osmin = [
$osmax = [
'RHEL 8' => '8.1',
'RHEL 7' => '8.1',
-// 'RHEL 6' => '7.3',
'CentOS 8' => '8.1',
'CentOS 7' => '8.1',
-// 'CentOS 6' => '7.3',
'Fedora 34' => '8.1',
'Fedora 33' => '8.1',
'Fedora 32' => '8.0',
];
$osname = [
- 'RHEL 8' => 'RHEL-8',
- 'RHEL 7' => 'RHEL-7 (maintained until June 2024)',
-// 'RHEL 6' => 'RHEL-6 (maintained until November 2020)',
- 'CentOS 8' => 'CentOS 8',
- 'CentOS 7' => 'CentOS 7 (maintained until June 2024)',
-// 'CentOS 6' => 'CentOS 6 (maintained until November 2020)',
- 'Fedora 34' => 'Fedora 34',
- 'Fedora 33' => 'Fedora 33',
- 'Fedora 32' => 'Fedora 32 (End of life since May 2021)',
-// 'Fedora 31' => 'Fedora 31 (End of life since November 2020)',
-];
-$grpname = [
- 'RHEL' => 'Red Hat Enterprise Linux',
- 'CentOS' => 'CentOS',
- 'Fedora' => 'Fedora',
+ ':rhel' => 'Red Hat Enterprise Linux',
+ 'RHEL 8' => 'RHEL 8.4',
+ 'RHEL 7' => 'RHEL 7.9 (maintained until June 2024)',
+ ':centos' => 'CentOS Linux and other clones',
+ 'CentOS 8' => 'CentOS 8.4.2105',
+ 'CentOS 7' => 'CentOS 7.9.2009 (maintained until June 2024)',
+ ':fedora' => 'Fedora Linux',
+ 'Fedora 34' => 'Fedora 34',
+ 'Fedora 33' => 'Fedora 33',
+ 'Fedora 32' => 'Fedora 32 (End of life since May 2021)',
];
$types = [
'base' => 'Default / Single version (simplest way)',
@@ -124,13 +113,14 @@ $type = (isset($_POST['type']) && isset($types[$_POST['type']]) ? $_POST['type'
<option value=''>--</option>
<?php
$prev = false;
- foreach($osvers as $osver => $phpver) {
- list($dist, $ver) = explode(' ', $osver, 2);
- if ($dist != $prev) {
+ foreach($osname as $osver => $name) {
+ if ($osver[0] == ':') {
if ($prev) echo "</optgroup>";
- printf("<optgroup label='%s'>", $grpname[$prev=$dist]);
- }
- printf("<option value='%s' %s>&nbsp;&nbsp;&nbsp;&nbsp;%s</option>", $osver, ($osver===$os ? 'selected' : ''), $osname[$osver]);
+ printf("<optgroup label='%s'>", $name);
+ $prev = true;
+ } else {
+ printf("<option value='%s' %s>&nbsp;&nbsp;&nbsp;&nbsp;%s</option>", $osver, ($osver===$os ? 'selected' : ''), $name);
+ }
}
?>
</optgroup></select>