From da3c0c44e13c665034d5922678388e3ee52e2da6 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 01 Jul 2016 03:52:28 -0400
Subject: [PATCH] - fixed expert install mode and merged code, fixed #3990
---
server/scripts/update_from_dev.sh | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh
old mode 100644
new mode 100755
index 98adb17..0be6598
--- a/server/scripts/update_from_dev.sh
+++ b/server/scripts/update_from_dev.sh
@@ -1,17 +1,29 @@
#!/bin/bash
-cd /tmp
-rm -f ispconfig3-dev.tar.gz
-wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
-rm -rf ispconfig3-master*
+{
+ umask 0077 \
+ && tmpdir=`mktemp -dt "$(basename $0).XXXXXXXXXX"` \
+ && test -d "${tmpdir}" \
+ && cd "${tmpdir}"
+} || {
+ echo 'mktemp failed'
+ exit 1
+}
+
+wget -O ispconfig3-dev.tar.gz "https://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
tar xzf ispconfig3-dev.tar.gz
+
+echo -n "Latest git version: "
+ls -1d ispconfig3-master*
cd ispconfig3-master*/install
+
php -q \
-d disable_classes= \
-d disable_functions= \
-d open_basedir= \
update.php
+
cd /tmp
-rm -rf /tmp/ispconfig3-master* /tmp/ispconfig3-dev.tar.gz
+rm -rf "${tmpdir}"
exit 0
--
Gitblit v1.9.1