From a7796bec1be01b51f400e9a3a698535b12b636aa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:44:27 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/scripts/update_from_dev.sh | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh
old mode 100644
new mode 100755
index 148899c..fe2f6ef
--- a/server/scripts/update_from_dev.sh
+++ b/server/scripts/update_from_dev.sh
@@ -1,16 +1,29 @@
#!/bin/bash
-cd /tmp
-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 "http://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