From 344393105ed4c6f5aac0092f4aef8cc302145d53 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 3 Sep 2008 19:06:19 +0000
Subject: [PATCH] - reorganized the installer - part 1
---
.../lib/{fedora9.lib.php => fedora.lib.php} | 2 +-
.../{opensuse110.lib.php => opensuse.lib.php} | 0
install/install.php | 9 +++++----
install/lib/install.lib.php | 18 +++++++++++++-----
4 files changed, 19 insertions(+), 10 deletions(-)
rename install/dist/lib/{fedora9.lib.php => fedora.lib.php} (99%)
rename install/dist/lib/{opensuse110.lib.php => opensuse.lib.php} (100%)
diff --git a/install/dist/lib/fedora9.lib.php b/install/dist/lib/fedora.lib.php
similarity index 99%
rename from install/dist/lib/fedora9.lib.php
rename to install/dist/lib/fedora.lib.php
index 167bf3aec1..2d15af97ec 100644
--- a/install/dist/lib/fedora9.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -28,7 +28,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-class installer extends installer_base {
+class installer_dist extends installer_base {
function configure_postfix($options = '')
{
diff --git a/install/dist/lib/opensuse110.lib.php b/install/dist/lib/opensuse.lib.php
similarity index 100%
rename from install/dist/lib/opensuse110.lib.php
rename to install/dist/lib/opensuse.lib.php
diff --git a/install/install.php b/install/install.php
index 07e6886baf..1c44826242 100644
--- a/install/install.php
+++ b/install/install.php
@@ -57,13 +57,14 @@ require_once('lib/install.lib.php');
require_once('lib/installer_base.lib.php');
//** Get distribution identifier
-$distname = get_distname();
+$dist = get_distname();
-if($distname == '') die('Linux Dustribution or Version not recognized.');
+if($dist['id'] == '') die('Linux Dustribution or Version not recognized.');
//** Include the distribution specific installer class library and configuration
-include_once('dist/lib/'.$distname.'.lib.php');
-include_once('dist/conf/'.$distname.'.conf.php');
+if(is_file('dist/lib/'.strtolower($dist['name']).'.lib.php')) include_once('dist/lib/'.strtolower($dist['name']).'.lib.php');
+include_once('dist/lib/'.$dist['id'].'.lib.php');
+include_once('dist/conf/'.$dist['id'].'.conf.php');
//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index aad7b4a3fa..24c596241b 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -65,11 +65,15 @@ function get_distname() {
if(file_exists('/etc/debian_version')) {
if(trim(file_get_contents('/etc/debian_version')) == '4.0') {
- $distname = 'debian40';
+ $distname = 'Debian';
+ $distver = '4.0';
+ $distid = 'debian40';
swriteln("Operating System: Debian 4.0 or compatible\n");
}
if(trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
- $distname = 'debian40';
+ $distname = 'Debian';
+ $distver = 'Lenny/Sid';
+ $distid = 'debian40';
swriteln("Operating System: Debian Lenny/Sid or compatible\n");
}
}
@@ -77,7 +81,9 @@ function get_distname() {
//** OpenSuSE
elseif(file_exists("/etc/SuSE-release")) {
if(stristr(file_get_contents('/etc/SuSE-release'),'11.0')) {
- $distname = 'opensuse110';
+ $distname = 'openSUSE';
+ $distver = '11.0';
+ $distid = 'opensuse110';
swriteln("Operating System: openSUSE 11.0 or compatible\n");
}
}
@@ -89,7 +95,9 @@ function get_distname() {
$content = file_get_contents('/etc/redhat-release');
if(stristr($content,'Fedora release 9 (Sulphur)')) {
- $distname = 'fedora9';
+ $distname = 'Fedora';
+ $distver = '9';
+ $distid = 'fedora9';
swriteln("Operating System: Fedora 9 or compatible\n");
}
@@ -98,7 +106,7 @@ function get_distname() {
die('unrecognized linux distribution');
}
- return $distname;
+ return array('name' => $distname, 'version' => $distver, 'id' => $distid);
}
function sread() {
--
GitLab