X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=INSTALL.sh;h=95cc98d26d0f86e47bf49860c9cd692bfd0d8bf2;hb=cbc55a7b9f2928c7f84a0b52d8e8bab73806bc03;hp=e8310bdcad6553b75e72ff97f621deb4502d3baf;hpb=de865f1c7ca1c4d0395aa745cf9e4e46744b6706;p=curl-de-sac.git

diff --git a/INSTALL.sh b/INSTALL.sh
index e8310bd..95cc98d 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+#set -x
 #
 # Defaults
 #
@@ -46,7 +46,7 @@ function usage () {
     # echo "  -C config filename              - def. \"$brisk_conf\""
     # echo "  -U unix socket path             - def. \"$usock_path\""
     # echo "  -u system user to run brisk dae - def. \"$sys_user\""
-    # echo "  -x copy tests as normal php     - def. \"$test_add\""
+    echo "  -x copy tests as normal php     - def. \"$test_add\""
     echo
 }
 
@@ -154,7 +154,7 @@ while [ $# -gt 0 ]; do
 #        -U*) usock_path="$(get_param "-U" "$1" "$2")"; sh=$?;;
 #        -u*) sys_user="$(get_param "-u" "$1" "$2")"; sh=$?;;
 #        system) action=system;;
-        -W) web_only="TRUE";;
+#        -W) web_only="TRUE";;
         -x) test_add="TRUE";;
         -h) usage $0; exit 0;;
 	*) usage $0; exit 1;;
@@ -263,7 +263,7 @@ if [ "$web_only" != "TRUE" ]; 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
 
@@ -271,9 +271,12 @@ for i in $(find web -name '.htaccess' -o -name '*.php' -o -name '*.phh' -o -name
     install -m 644 "web/$i" "${web_path}/$i"
 done
 if [ "$test_add" = "TRUE" ]; then
-    for i in $(find webtest -name '.htaccess' -o -name '*.php' -o -name '*.phh' -o -name '*.pho' -o -name '*.css' -o -name '*.js' -o -name '*.mp3' -o -name '*.swf' -o -name 'terms-of-service*' | sed 's/^........//g'); do
+    for i in $(find webtest -name '.htaccess' -o -name '*.phh' -o -name '*.pho' -o -name '*.css' -o -name '*.js' -o -name '*.mp3' -o -name '*.swf' -o -name 'terms-of-service*' | sed 's/^........//g'); do
         install -m 644 "webtest/$i" "${web_path}/$i"
     done
+    for i in $(find webtest -name '*.php' | sed 's/^........//g'); do
+        install -m 755 "webtest/$i" "${web_path}/$i"
+    done
 fi
 
 # # .js substitutions