From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/scripts/update_from_tgz.sh | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/server/scripts/update_from_tgz.sh b/server/scripts/update_from_tgz.sh
index 7d59e40..9dcf52d 100644
--- a/server/scripts/update_from_tgz.sh
+++ b/server/scripts/update_from_tgz.sh
@@ -1,11 +1,14 @@
#!/bin/bash
-cd /tmp
-
-if [ -f ISPConfig-3-stable.tar.gz ]
-then
-rm -f ISPConfig-3-stable.tar.gz
-fi
+{
+ umask 0077 \
+ && tmpdir=`mktemp -dt "$(basename $0).XXXXXXXXXX"` \
+ && test -d "${tmpdir}" \
+ && cd "${tmpdir}"
+} || {
+ echo 'mktemp failed'
+ exit 1
+}
wget http://www.ispconfig.org/downloads/ISPConfig-3-stable.tar.gz
if [ -f ISPConfig-3-stable.tar.gz ]
@@ -13,14 +16,15 @@
tar xvfz ISPConfig-3-stable.tar.gz
cd ispconfig3_install/install/
php -q \
- -d disable_classes= \
- -d disable_functions= \
- -d open_basedir= \
- update.php
- rm -rf /tmp/ispconfig3_install/install
- rm -f ISPConfig-3-stable.tar.gz
+ -d disable_classes= \
+ -d disable_functions= \
+ -d open_basedir= \
+ update.php
+ cd /tmp
+ rm -rf "${tmpdir}"
else
echo "Unable to download the update."
+ exit 1
fi
-exit 0
\ No newline at end of file
+exit 0
--
Gitblit v1.9.1