From d925b32c307121dd89a4424889c92a8c7f986811 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 10 Nov 2015 10:59:59 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/scripts/update_from_dev.sh | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh
index 12f62aa..98adb17 100644
--- a/server/scripts/update_from_dev.sh
+++ b/server/scripts/update_from_dev.sh
@@ -1,15 +1,17 @@
#!/bin/bash
cd /tmp
+rm -f ispconfig3-dev.tar.gz
wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
+rm -rf ispconfig3-master*
tar xzf ispconfig3-dev.tar.gz
-cd ispconfig3.git/install
+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
+rm -rf /tmp/ispconfig3-master* /tmp/ispconfig3-dev.tar.gz
-exit 0
\ No newline at end of file
+exit 0
--
Gitblit v1.9.1