From a7796bec1be01b51f400e9a3a698535b12b636aa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:44:27 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/lib/install.lib.php | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 5a2737a..08b0f84 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -86,6 +86,24 @@
$mainver = array_filter($mainver);
$mainver = current($mainver).'.'.next($mainver);
switch ($mainver){
+ case "15.10":
+ $relname = "(Wily Werewolf)";
+ break;
+ case "15.04":
+ $relname = "(Vivid Vervet)";
+ break;
+ case "14.10":
+ $relname = "(Utopic Unicorn)";
+ break;
+ case "14.04":
+ $relname = "(Trusty Tahr)";
+ break;
+ case "13.10":
+ $relname = "(Saucy Salamander)";
+ break;
+ case "13.04":
+ $relname = "(Raring Ringtail)";
+ break;
case "12.10":
$relname = "(Quantal Quetzal)";
break;
@@ -166,6 +184,12 @@
$distid = 'debian60';
$distbaseid = 'debian';
swriteln("Operating System: Debian 7.0 (Wheezy/Sid) or compatible\n");
+ } elseif(strstr(trim(file_get_contents('/etc/debian_version')), '8') || substr(trim(file_get_contents('/etc/debian_version')),0,1) == '8') {
+ $distname = 'Debian';
+ $distver = 'Jessie';
+ $distid = 'debian60';
+ $distbaseid = 'debian';
+ swriteln("Operating System: Debian 8.0 (Jessie) or compatible\n");
} else {
$distname = 'Debian';
$distver = 'Unknown';
@@ -246,6 +270,18 @@
$distid = 'centos53';
$distbaseid = 'fedora';
swriteln("Operating System: CentOS 5 or compatible\n");
+ } elseif(stristr($content, 'CentOS Linux release 6')) {
+ $distname = 'CentOS';
+ $distver = 'Unknown';
+ $distid = 'centos53';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: CentOS 6 or compatible\n");
+ } elseif(stristr($content, 'CentOS Linux release 7')) {
+ $distname = 'CentOS';
+ $distver = 'Unknown';
+ $distid = 'centos70';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: CentOS 7 or compatible\n");
} else {
$distname = 'Redhat';
$distver = 'Unknown';
@@ -836,20 +872,20 @@
if(is_installed('apache2ctl')) $cmd = 'apache2ctl -v';
elseif(is_installed('apachectl')) $cmd = 'apachectl -v';
else {
- $app->log("Could not check apache version, apachectl not found.", LOGLEVEL_WARN);
+ ilog("Could not check apache version, apachectl not found.");
return '2.2';
}
exec($cmd, $output, $return_var);
if($return_var != 0 || !$output[0]) {
- $app->log("Could not check apache version, apachectl did not return any data.", LOGLEVEL_WARN);
+ ilog("Could not check apache version, apachectl did not return any data.");
return '2.2';
}
if(preg_match('/version:\s*Apache\/(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) {
return $matches[1] . (isset($matches[3]) ? '.' . $matches[3] : '') . (isset($matches[5]) && $get_minor == true ? '.' . $matches[5] : '');
} else {
- $app->log("Could not check apache version, did not find version string in apachectl output.", LOGLEVEL_WARN);
+ ilog("Could not check apache version, did not find version string in apachectl output.");
return '2.2';
}
}
@@ -861,13 +897,13 @@
if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
else {
- $app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN);
+ ilog("Could not check apache modules, apachectl not found.");
return array();
}
exec($cmd . ' 2>/dev/null', $output, $return_var);
if($return_var != 0 || !$output[0]) {
- $app->log("Could not check apache modules, apachectl did not return any data.", LOGLEVEL_WARN);
+ ilog("Could not check apache modules, apachectl did not return any data.");
return array();
}
--
Gitblit v1.9.1