From bab36b51e6cf65db4557125a11ec584e005fefaa Mon Sep 17 00:00:00 2001
From: agoston <agoston@ispconfig3>
Date: Thu, 03 Dec 2009 10:17:24 -0500
Subject: [PATCH] - removed number from conf[version] because it is the version of baselayout - as apache 2.2.14 the ssl directory moved to /etc/ssl/apache2 from /etc/apache2/ssl
---
install/lib/install.lib.php | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index e51d643..889821c 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -149,7 +149,7 @@
} elseif(stristr($content,'CentOS release 5.3 (Final)')) {
$distname = 'CentOS';
$distver = '5.3';
- $distid = 'centos52';
+ $distid = 'centos53';
$distbaseid = 'fedora';
swriteln("Operating System: CentOS 5.3 or compatible\n");
} else {
@@ -159,7 +159,19 @@
$distbaseid = 'fedora';
swriteln("Operating System: Redhat or compatible, unknown version.\n");
}
-
+ }
+
+ //** Gentoo
+ elseif(file_exists("/etc/gentoo-release")) {
+
+ $content = file_get_contents('/etc/gentoo-release');
+
+ preg_match_all('/([0-9]{1,2})/', $content, $version);
+ $distname = 'Gentoo';
+ $distver = $version[0][0].$version[0][1];
+ $distid = 'gentoo';
+ $distbaseid = 'gentoo';
+ swriteln("Operating System: Gentoo $distver or compatible\n");
} else {
die('unrecognized linux distribution');
@@ -606,7 +618,7 @@
}
function is_installed($appname) {
- exec('which '.escapeshellcmd($appname).' > /dev/null 2> /dev/null',$out);
+ exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
if(isset($out[0]) && stristr($out[0],$appname)) {
return true;
} else {
--
Gitblit v1.9.1