From 9994de85fcf14a98dcc54cc7399b87e34d9b3c29 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 17 Mar 2009 09:23:07 -0400
Subject: [PATCH] Updated all language files.
---
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 b624be4..21ff781 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -70,7 +70,7 @@
$distbaseid = 'debian';
swriteln("Operating System: Debian 4.0 or compatible\n");
}
- if(trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
+ if(trim(file_get_contents('/etc/debian_version')) == '5.0' || trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
$distname = 'Debian';
$distver = 'Lenny/Sid';
$distid = 'debian40';
@@ -88,6 +88,13 @@
$distbaseid = 'opensuse';
swriteln("Operating System: openSUSE 11.0 or compatible\n");
}
+ if(stristr(file_get_contents('/etc/SuSE-release'),'11.1')) {
+ $distname = 'openSUSE';
+ $distver = '11.1';
+ $distid = 'opensuse110';
+ $distbaseid = 'opensuse';
+ swriteln("Operating System: openSUSE 11.1 or compatible\n");
+ }
}
@@ -102,6 +109,14 @@
$distid = 'fedora9';
$distbaseid = 'fedora';
swriteln("Operating System: Fedora 9 or compatible\n");
+ }
+
+ if(stristr($content,'Fedora release 10 (Cambridge)')) {
+ $distname = 'Fedora';
+ $distver = '10';
+ $distid = 'fedora9';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: Fedora 10 or compatible\n");
}
if(stristr($content,'CentOS release 5.2 (Final)')) {
@@ -508,7 +523,7 @@
return false;
}
-function replaceLine($filename,$search_pattern,$new_line,$strict = 0) {
+function replaceLine($filename,$search_pattern,$new_line,$strict = 0,$append = 1) {
if($lines = @file($filename)) {
$out = '';
$found = 0;
@@ -530,7 +545,10 @@
}
}
if($found == 0) {
- $out .= $new_line."\n";
+ //* add \n if the last line does not end with \n or \r
+ if(substr($out,-1) != "\n" && substr($out,-1) != "\r") $out .= "\n";
+ //* add the new line at the end of the file
+ if($append == 1) $out .= $new_line."\n";
}
file_put_contents($filename,$out);
}
@@ -555,7 +573,7 @@
}
function is_installed($appname) {
- exec('which '.escapeshellcmd($appname),$out);
+ exec('which '.escapeshellcmd($appname).' > /dev/null 2> /dev/null',$out);
if(isset($out[0]) && stristr($out[0],$appname)) {
return true;
} else {
@@ -565,4 +583,4 @@
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1