From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Thu, 25 Sep 2014 06:13:29 +0000 (+0200)
Subject: installation: reduce time when the install directry is unavailable
X-Git-Tag: v4.15.0~10
X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=d075f429e05ba9d75cbbb372f90ec268d25932af

installation: reduce time when the install directry is unavailable
---

diff --git a/INSTALL.sh b/INSTALL.sh
index 347b652..705fdf2 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -407,10 +407,6 @@ sed -i "s@\( \+cookiepath *: *\)\"[^\"]*\" *,@\1 \"$prefix_path\",@g" ${web_path
 document_root="$(grep DocumentRoot "${apache_conf}"  | grep -v '^[ 	]*#' | awk '{ print $2 }')"
 sed -i "s@^\(\$DOCUMENT_ROOT *= *[\"']\)[^\"']*\([\"']\)@\1$document_root\2@g" ${web_path}__/spush/*.ph*
 
-if [ -d ${web_path} ]; then
-    mv ${web_path} ${web_path}.old
-fi
-
 if [ -d ../brisk-img ]; then
     cd ../brisk-img
     ./INSTALL.sh -w ${web_path}__
@@ -439,6 +435,10 @@ else
     cp  "${web_path}__""/Obj/brisk.conf-templ.pho" "$etc_path/$brisk_conf"
 fi
 
+if [ -d ${web_path} ]; then
+    mv ${web_path} ${web_path}.old
+fi
+
 mv ${web_path}__ ${web_path}
 if [ -d ${web_path}.old ]; then
     rm -rf ${web_path}.old