From d4c9b31f263b332d52c73925a6eaef7ed4be96eb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 22 Apr 2008 18:01:25 -0400
Subject: [PATCH] - Improved the debian installation manual - Fixed a bug in the installer.

---
 install/lib/install.lib.php |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index f705d2b..b8f40f1 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -56,16 +56,34 @@
 
 $FILE = realpath('../install.php');
 
+//** Get distribution identifier
 function get_distname() {
-	global $conf; // TODO wtf ?
-	$distname = $conf['distname'];
+	
+	$distname = '';
+	
+	//** Debian or Ubuntu
+	if(file_exists('/etc/debian_version')) {
+	
+		if(trim(file_get_contents('/etc/debian_version')) == '4.0') {
+			$distname = 'debian40';
+			swriteln("Operating System: Debian 4.0 or compatible\n");
+		}
+		if(trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
+			$distname = 'debian40';
+			swriteln("Operating System: Debian Lenny/Sid or compatible\n");
+		}
+	}
+	
+	//** Redhat
+	elseif(file_exists("/etc/redhat_release")) {
+	
+	}
+	
 	return $distname;
 }
 
 function sread() {
-    $f = fopen('/dev/stdin', 'r');
-    $input = fgets($f, 255);
-    fclose($f);
+    $input = fgets(STDIN);
     return rtrim($input);
 }
 

--
Gitblit v1.9.1