From 90511b77e35e9f76d203723a61a247d7852223fd Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 3 Sep 2008 19:11:10 +0000
Subject: [PATCH] - reorganized the installer - part 3
---
install/install.php | 2 +-
install/lib/install.lib.php | 6 +++++-
install/update.php | 9 ++++++---
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/install/install.php b/install/install.php
index 1c44826242..5f46d0ad27 100644
--- a/install/install.php
+++ b/install/install.php
@@ -62,7 +62,7 @@ $dist = get_distname();
if($dist['id'] == '') die('Linux Dustribution or Version not recognized.');
//** Include the distribution specific installer class library and configuration
-if(is_file('dist/lib/'.strtolower($dist['name']).'.lib.php')) include_once('dist/lib/'.strtolower($dist['name']).'.lib.php');
+if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
include_once('dist/lib/'.$dist['id'].'.lib.php');
include_once('dist/conf/'.$dist['id'].'.conf.php');
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 24c596241b..ff47eee828 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -68,12 +68,14 @@ function get_distname() {
$distname = 'Debian';
$distver = '4.0';
$distid = 'debian40';
+ $distbaseid = 'debian';
swriteln("Operating System: Debian 4.0 or compatible\n");
}
if(trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
$distname = 'Debian';
$distver = 'Lenny/Sid';
$distid = 'debian40';
+ $distbaseid = 'debian';
swriteln("Operating System: Debian Lenny/Sid or compatible\n");
}
}
@@ -84,6 +86,7 @@ function get_distname() {
$distname = 'openSUSE';
$distver = '11.0';
$distid = 'opensuse110';
+ $distbaseid = 'opensuse';
swriteln("Operating System: openSUSE 11.0 or compatible\n");
}
}
@@ -98,6 +101,7 @@ function get_distname() {
$distname = 'Fedora';
$distver = '9';
$distid = 'fedora9';
+ $distbaseid = 'fedora';
swriteln("Operating System: Fedora 9 or compatible\n");
}
@@ -106,7 +110,7 @@ function get_distname() {
die('unrecognized linux distribution');
}
- return array('name' => $distname, 'version' => $distver, 'id' => $distid);
+ return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
}
function sread() {
diff --git a/install/update.php b/install/update.php
index 59c784a2b8..2a0054e5ab 100644
--- a/install/update.php
+++ b/install/update.php
@@ -59,15 +59,18 @@ if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
}
//** Get distribution identifier
-$distname = get_distname();
+$dist = get_distname();
include_once("/usr/local/ispconfig/server/lib/config.inc.php");
$conf_old = $conf;
unset($conf);
+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/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
+include_once('dist/lib/'.$dist['id'].'.lib.php');
+include_once('dist/conf/'.$dist['id'].'.conf.php');
//** Get hostname
exec('hostname -f', $tmp_out);
--
GitLab