From 11201c5e3b31d35e23b03f40e3d242014f15ce49 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 13 Apr 2011 09:45:40 -0400
Subject: [PATCH] - Added on_after_delete event handler in tform_actions.inc.php - Improved monitor.php file.
---
helper_scripts/gentoo_setup.sh | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/helper_scripts/gentoo_setup.sh b/helper_scripts/gentoo_setup.sh
index 0138b33..21b9d02 100644
--- a/helper_scripts/gentoo_setup.sh
+++ b/helper_scripts/gentoo_setup.sh
@@ -44,12 +44,21 @@
[ -n "$res" ]
}
+function package_is_emerged()
+{
+ local package=$1
+
+ installed=`equery -C -N list -e -i $1 | grep $1 | grep "^\[I"`
+ [ -n "$installed" ]
+}
+
function is_package_installed()
{
local usechange="no"
local uselist=""
- installed=`equery -C -N list -e -i $1 | grep $1 | grep "^\[I"`
+ package_is_emerged "$1"
+ installed=$?
if [ -n "$2" ] # Use flags parsed
then
@@ -64,7 +73,7 @@
flagedit $1 $uselist
fi
- [ -n "$installed" ] && [ "$usechange" == "no" ]
+ [ $installed -eq 0 ] && [ "$usechange" == "no" ]
}
function install_progress()
@@ -247,7 +256,7 @@
package_list="$package_list app-admin/webalizer"
fi
- if is_package_installed "app-admin/vlogger"
+ if ! is_package_installed "app-admin/vlogger"
then
# Check if package is masked
if [ -n "$(equery -C -N list -I -o -e app-admin/vlogger | grep app-admin/vlogger | awk '{print $2}' | grep '^\[M')" ]
@@ -468,7 +477,7 @@
for logger in $loggers
do
- if ! is_package_installed "app-admin/$logger" && [ -n "$(rc-config list default | grep $logger)" ]
+ if is_package_installed "app-admin/$logger" && [ -n "$(rc-config list default | grep $logger)" ]
then
clogger=$logger
break
@@ -491,7 +500,7 @@
if [ "$Return_Val" = "yes" ]
then
echo -e ""
- exec_command "/etc/init.d/syslog-ng stop" "Stopping $clogger"
+ exec_command "/etc/init.d/$clogger stop" "Stopping $clogger"
exec_command "rc-update del $clogger default" "Remove $clogger from default runlevel"
else
rsyslog_install="no"
@@ -503,7 +512,7 @@
then
exec_command "emerge app-admin/rsyslog" "Installing rsyslog"
exec_command "/etc/init.d/rsyslog start" "Starting rsyslog"
- exec_command "rc-update add mysql default" "Add rsyslog to default runlevel"
+ exec_command "rc-update add rsyslog default" "Add rsyslog to default runlevel"
fi
echo -e ""
@@ -512,10 +521,17 @@
if ! is_package_installed "dev-db/mysql" "extraengine big-tables"
then
+ package_is_emerged "$1"
+ installed=$?
+
exec_command "emerge dev-db/mysql" "Installing MySql"
- exec_command "mysql_install_db" "Set-up mysql grant tables"
- exec_command "/etc/init.d/mysql start" "Starting MySql"
- exec_command "rc-update add mysql default" "Add MySql to default runlevel"
+
+ if [ $installed -eq 1 ]
+ then
+ exec_command "mysql_install_db" "Set-up mysql grant tables"
+ exec_command "/etc/init.d/mysql start" "Starting MySql"
+ exec_command "rc-update add mysql default" "Add MySql to default runlevel"
+ fi
fi
which vim &> /dev/null
@@ -588,6 +604,11 @@
fi
fi
+if [ "$install_web" = "no" ] && ! is_package_installed "dev-lang/php" "-apache2 gd mysql mysqli imap cli cgi pcre xml zlib crypt ctype session unicode mhash ftp"
+then
+ exec_command "emerge dev-lang/php" "Installing PHP"
+fi
+
echo -e ""
echo -e "\e[1;33mSetup script completed\e[0m"
echo -e "\e[1;32m========================================\e[0m"
--
Gitblit v1.9.1