maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix bugs is dist detection

Browse Source
This commit is contained in:
Ante de Baas
2020-05-31 16:00:50 +02:00
parent 6ccfb7efbb
commit 0d44adf265
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/lib/class.FroxlorInstall.php
View File

@@ -1342,13 +1342,13 @@ class FroxlorInstall
$this->_data['distribution'] = $_POST['distribution']; $this->_data['distribution'] = $_POST['distribution'];
} else { } else {
$os_dist = parse_ini_file('/etc/os-release', false); $os_dist = parse_ini_file('/etc/os-release', false);
$os_version = explode('.',$os_version['VERSION_ID'])[0]; $os_version = explode('.',$os_dist['VERSION_ID'])[0];
$distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/') . '*.xml'); $distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/') . '*.xml');
foreach ($distros as $_distribution) { foreach ($distros as $_distribution) {
$dist = new \Froxlor\Config\ConfigParser($_distribution); $dist = new \Froxlor\Config\ConfigParser($_distribution);
$ver = explode('.', $dist->distributionVersion)[0]; $ver = explode('.', $dist->distributionVersion)[0];
if (strtolower($os_dist['ID']) == strtolower($dist->distributionName) && $os_version = $ver) { if (strtolower($os_dist['ID']) == strtolower($dist->distributionName) && $os_version == $ver) {
$this->_data['distribution'] = str_replace(".xml", "", strtolower(basename($_distribution))); $this->_data['distribution'] = str_replace(".xml", "", strtolower(basename($_distribution)));
} }
} }