Fixed some autoupdate-problems

Author: vogelor

server/mods-available/remoteaction_core_module.inc.php

@@ -179,17 +179,16 @@ private function _doIspCUpdate($action) {
 		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"

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