From 344393105ed4c6f5aac0092f4aef8cc302145d53 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 03 Sep 2008 15:06:19 -0400
Subject: [PATCH] - reorganized the installer - part 1

---
 install/install.php |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/install/install.php b/install/install.php
index 07e6886..1c44826 100644
--- a/install/install.php
+++ b/install/install.php
@@ -57,13 +57,14 @@
 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');

--
Gitblit v1.9.1