From 012386950fc18583ac3dbea03cca19ef2db46e18 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Tue, 29 Mar 2011 19:45:58 +0000
Subject: [PATCH] Fixed some autoupdate-problems
---
.../remoteaction_core_module.inc.php | 7 +++----
server/server.sh | 20 ++++++++++++++++++-
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index 4416bd8af..937523344 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -179,17 +179,16 @@ class remoteaction_core_module {
exec("tar xvfz ISPConfig-" . $new_version . ".tar.gz");
/*
- * Start the automated update
+ * Initialize the automated update
+ * (the update is then done next start of server.sh
*/
chdir("/tmp/ispconfig3_install/install");
exec("touch autoupdate");
- exec("php -q autoupdate.php");
-
+
/*
* do some clean-up
*/
exec("rm /tmp/ISPConfig-" . $new_version . ".tar.gz");
- exec("rm /tmp/ispconfig3_install -R");
/*
* go back to the "old path"
diff --git a/server/server.sh b/server/server.sh
index df844bcbe..7302ca43c 100644
--- a/server/server.sh
+++ b/server/server.sh
@@ -4,4 +4,22 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
. /etc/profile
-/usr/bin/php -q /usr/local/ispconfig/server/server.php
+if [ -f /tmp/ispconfig3_install/install/autoupdate ]; then
+ #
+ # there is a auto-update waiting for update, so let's do it
+ #
+ cd /tmp/ispconfig3_install/install
+ /usr/bin/php -q autoupdate.php
+ cd /
+
+ #
+ # do some clean-up
+ #
+ rm /tmp/ispconfig3_install -R
+
+else
+ #
+ # there is no update waiting, so lets start the ISPConfig-System
+ #
+ /usr/bin/php -q /usr/local/ispconfig/server/server.php
+fi
\ No newline at end of file
--
GitLab