From a538a12118bb484b658c40ecb73882bb8a2002a1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 06:39:50 -0500
Subject: [PATCH] Fixed: FS#3933 - Invalid sendmail "from" in php_fpm_pool.conf.master
---
server/scripts/update_from_dev.sh | 24 +++++++++++++++++++-----
1 files changed, 19 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 12f62aa..fe2f6ef
--- a/server/scripts/update_from_dev.sh
+++ b/server/scripts/update_from_dev.sh
@@ -1,15 +1,29 @@
#!/bin/bash
-cd /tmp
+{
+ 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
-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