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_dev.sh | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh old mode 100644 new mode 100755 index 12f62aa..0be6598 --- a/server/scripts/update_from_dev.sh +++ b/server/scripts/update_from_dev.sh @@ -1,15 +1,29 @@ #!/bin/bash -cd /tmp -wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=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 -cd ispconfig3.git/install + +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.git /tmp/ispconfig3-dev.tar.gz -exit 0 \ No newline at end of file +cd /tmp +rm -rf "${tmpdir}" + +exit 0 -- Gitblit v1.9.1