From 0c381c4da634a920f70e0886dc74e162c77645e6 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 24 May 2016 02:44:21 -0400
Subject: [PATCH] Implemented #3916 Disabled Strict-Transport-Security in default apache template.
---
server/scripts/update_from_dev.sh | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh
old mode 100644
new mode 100755
index de93fd9..0be6598
--- a/server/scripts/update_from_dev.sh
+++ b/server/scripts/update_from_dev.sh
@@ -1,11 +1,29 @@
#!/bin/bash
-cd /tmp
-wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
-tar xzf ispconfig3-dev.tar.gz
-cd ispconfig3.git/install
-php -q update.php
-cd /tmp
-rm -rf /tmp/ispconfig3.git /tmp/ispconfig3-dev.tar.gz
+{
+ umask 0077 \
+ && tmpdir=`mktemp -dt "$(basename $0).XXXXXXXXXX"` \
+ && test -d "${tmpdir}" \
+ && cd "${tmpdir}"
+} || {
+ echo 'mktemp failed'
+ exit 1
+}
-exit 0
\ No newline at end of file
+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 "${tmpdir}"
+
+exit 0
--
Gitblit v1.9.1