Skip to content

Commit 97b9db5

Browse files
ms217ms217
committed
clean up
1 parent efc2cbe commit 97b9db5

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

‎install/lib/install.lib.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,10 @@ function get_distname() {
296296

297297
$content = file_get_contents('/etc/os-release');
298298

299-
preg_match('/(?<=PRETTY_NAME=\").+?(?=\")/', $content, $prettyname);
299+
preg_match('/(?<=PRETTY_NAME=\").+?(?=\")/', $content, $prettyname);
300300
preg_match('/(?<=NAME=\").+?(?=\")/', $content, $name);
301-
preg_match('/(?<=VERSION=\").+?(?=\")/', $content, $version);
302-
preg_match('/(?<=VERSION_ID=\").+?(?=\")/', $content, $versionid);
301+
preg_match('/(?<=VERSION=\").+?(?=\")/', $content, $version);
302+
preg_match('/(?<=VERSION_ID=\").+?(?=\")/', $content, $versionid);
303303

304304
if(stristr($prettyname[0], 'Fedora 32 (Thirty Two)')) {
305305
$distname = 'Fedora';
@@ -343,8 +343,8 @@ function get_distname() {
343343
if(stristr($content, 'CentOS Linux release 6') || stristr($content, 'CentOS release 6')) {
344344
preg_match_all('/(6\.?([0-9]{0,2})\.?(\s)?([a-zA-Z()]+))$/', $content, $centos6_version);
345345
$distname = 'CentOS Linux';
346-
$distver = is_array($centos6_version)? implode('.', array_filter(array($centos6_version[0][0]),'strlen')) : '6';
347-
$distid = 'centos53';
346+
$distver = $centos6_version[0][0] ? $centos6_version[0][0] : '6';
347+
$distid = 'centos53';
348348
$distbaseid = 'fedora';
349349
swriteln("Operating System: " . $distname . " " . $distver . "\n");
350350

@@ -362,7 +362,7 @@ function get_distname() {
362362
if(stristr($content, 'CentOS Linux release 6') || stristr($content, 'CentOS release 6')) {
363363
preg_match_all('/(6)\.?([0-9]{0,2})?\.?\s([a-zA-Z(), ]+)?$/', $content, $centos6_version);
364364
$distname = 'CentOS Linux';
365-
$distver = $centos6_version[0][0];
365+
$distver = $centos6_version[0][0] ? $centos6_version[0][0] : '6';
366366
$distid = 'centos53';
367367
$distbaseid = 'fedora';
368368
swriteln("Operating System: " . $distname . " " . $distver . "\n");

‎server/lib/classes/monitor_tools.inc.php‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,12 @@ function get_distname() {
278278

279279
//** RHEL (including compatible clones) & Fedora
280280
elseif(file_exists('/etc/redhat-release') && file_exists('/etc/os-release')) {
281+
281282
$content = file_get_contents('/etc/os-release');
282283

283284
preg_match('/(?<=PRETTY_NAME=\").+?(?=\")/', $content, $prettyname);
284285
preg_match('/(?<=NAME=\").+?(?=\")/', $content, $name);
285-
preg_match('/(?<=VERSION=\").+?(?=\")/', $content, $version);
286+
preg_match('/(?<=VERSION=\").+?(?=\")/', $content, $version);
286287
preg_match('/(?<=VERSION_ID=\").+?(?=\")/', $content, $versionid);
287288

288289
if(stristr($prettyname[0], 'Fedora 32 (Thirty Two)')) {
@@ -298,15 +299,15 @@ function get_distname() {
298299
//** RHEL 7 and compatible clones
299300
} elseif(preg_match('/^(?:7|7\.[0-9]{1,2})$/', $versionid[0])) {
300301
preg_match_all('/([0-9]{1,2})\.?([0-9]{0,2})\.?([0-9]*)/', file_get_contents('/etc/redhat-release'), $centos7_version);
301-
$distname = $name[0];
302-
$distver = is_array($centos7_version)? implode('.', array_filter(array($centos7_version[1][0],$centos7_version[2][0],$centos7_version[3][0]),'strlen')) : $version[0];
303-
$distid = 'centos72';
304-
$distbaseid = 'fedora';
302+
$distname = $name[0];
303+
$distver = is_array($centos7_version)? implode('.', array_filter(array($centos7_version[1][0],$centos7_version[2][0],$centos7_version[3][0]),'strlen')) : $version[0];
304+
$distid = 'centos72';
305+
$distbaseid = 'fedora';
305306
//** RHEL 8 and compatible clones
306307
} elseif(preg_match('/^(?:8|8\.[0-9]{1,2})$/', $versionid[0])) {
307-
$distname = $name[0];
308-
$distver = $version[0];
309-
$distid = 'centos80';
308+
$distname = $name[0];
309+
$distver = $version[0];
310+
$distid = 'centos80';
310311
$distbaseid = 'fedora';
311312
} else {
312313
$distname = 'Redhat';
@@ -322,7 +323,7 @@ function get_distname() {
322323
if(stristr($content, 'CentOS Linux release 6') || stristr($content, 'CentOS release 6')) {
323324
preg_match_all('/(6\.?([0-9]{0,2})\.?(\s)?([a-zA-Z()]+))$/', $content, $centos6_version);
324325
$distname = 'CentOS Linux';
325-
$distver = is_array($centos6_version)? implode('.', array_filter(array($centos6_version[0][0]),'strlen')) : '6';
326+
$distver = $centos6_version[0][0] ? $centos6_version[0][0] : '6';
326327
$distid = 'centos53';
327328
$distbaseid = 'fedora';
328329
} else {
@@ -339,7 +340,7 @@ function get_distname() {
339340
if(stristr($content, 'CentOS Linux release 6') || stristr($content, 'CentOS release 6')) {
340341
preg_match_all('/(6)\.?([0-9]{0,2})?\.?\s([a-zA-Z(), ]+)?$/', $content, $centos6_version);
341342
$distname = 'CentOS Linux';
342-
$distver = $centos6_version[0][0];
343+
$distver = $centos6_version[0][0] ? $centos6_version[0][0] : '6';
343344
$distid = 'centos53';
344345
$distbaseid = 'fedora';
345346
} else {
@@ -351,8 +352,6 @@ function get_distname() {
351352
}
352353

353354

354-
355-
356355
//** Gentoo
357356
elseif(file_exists('/etc/gentoo-release')) {
358357

0 commit comments

Comments
 (0)