X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=INSTALL.sh;h=705fdf2fb38ce84d8e1ad2a42306dcff12394d19;hb=d075f429e05ba9d75cbbb372f90ec268d25932af;hp=3c254497ace7573b2bfa5f539e605ac370e0d807;hpb=14cd1fc05b5d9148de3c427e43bf60cfdf098e9d;p=brisk.git

diff --git a/INSTALL.sh b/INSTALL.sh
index 3c25449..705fdf2 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -120,7 +120,8 @@ if [ "$1" = "pkg" ]; then
     fi
     nam1="brisk_${tag}.tgz"
     nam2="brisk-img_${tag}.tgz"
-    echo "Build packages ${nam1} and ${nam2}."
+    nam2="curl-de-sac_${tag}.tgz"
+    echo "Build packages ${nam1}, ${nam2} and ${nam3}."
     read -p "Proceed [y/n]: " a
     if [ "$a" != "y" -a  "$a" != "Y" ]; then
         exit 1
@@ -129,11 +130,15 @@ if [ "$1" = "pkg" ]; then
     cd ../brisk-img
     git archive --format=tar --prefix=brisk-${tag}/brisk-img/ $tag | gzip > ../$nam2
     cd -
+    cd ../curl-de-sac
+    git archive --format=tar --prefix=brisk-${tag}/curl-de-sac/ $tag | gzip > ../$nam3
+    cd -
     exit 0
 fi
 
 if [ -f "$CONFIG_FILE" ]; then
    source "$CONFIG_FILE"
+   conffile_in="$CONFIG_FILE"
 fi
 
 if [ "x$prefix_path" = "x" ]; then
@@ -175,6 +180,7 @@ while [ $# -gt 0 ]; do
    	    exit 1
         fi
         . "$conffile"
+        conffile_in="$conffile"
     fi
     shift $sh
 done
@@ -341,7 +347,7 @@ if [ "$web_only" = "FALSE" ]; then
 
 fi
 install -d ${web_path}__
-for i in $(find web -type d | sed 's/^....//g'); do
+for i in $(find web -type d | grep '/' | sed 's/^....//g'); do
     install -d ${web_path}__/$i 
 done
 
@@ -401,15 +407,20 @@ 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}__
     cd - >/dev/null 2>&1
 fi
+if [ -d ../curl-de-sac ]; then
+    cd ../curl-de-sac
+    if [ ! -z "$conffile_in" ]; then
+        ./INSTALL.sh -f "$conffile_in" -w ${web_path}__
+    else
+        ./INSTALL.sh -w ${web_path}__
+    fi
+    cd - >/dev/null 2>&1
+fi
 
 # config file installation or diff
 if [ -f "$etc_path/$brisk_conf" ]; then
@@ -424,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