X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=INSTALL.sh;h=83884f6446294291482d758edc99384e75411c9c;hb=0aa336cce354db2f3320409259dac61f8b015be4;hp=36e2f703645d8e6ea11c56cc5b1fb2fa5c39d1eb;hpb=578fd5336a0555a04aee417bc74825706de8f42d;p=brisk.git

diff --git a/INSTALL.sh b/INSTALL.sh
index 36e2f70..83884f6 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -92,7 +92,7 @@ function searchetc() {
 #
 #  MAIN
 #
-declare -a nam
+declare -a nam nam_gz
 if [ "$1" = "chk" ]; then
     set -e
     oldifs="$IFS"
@@ -120,35 +120,32 @@ if [ "$1" = "pkg" ]; then
     else
         tag="$(git describe)"
     fi
-    nam_idx=0
-    nam[$nam_idx]="brisk_${tag}.tgz"
-    nam_idx=$((nam_idx + 1))
-    nam[$nam_idx]="brisk-img_${tag}.tgz"
+    nam=("brisk" "brisk-img" "fieldify")
+    nam_idx=3
 
     if [ -d ../curl-de-sac ]; then
+       nam[$nam_idx]="curl-de-sac"
        nam_idx=$((nam_idx + 1))
-       nam[$nam_idx]="curl-de-sac_${tag}.tgz"
     fi
     pkg_list=""
     sep=""
-    for i in ${nam[@]}; do
-        pkg_list="${pkg_list}${sep}${i}"
+    for i in $( seq 0 $((${#nam[@]} - 1)) ); do
+        echo "$i"
+        nam_gz[$i]="${nam[$i]}_${tag}.tgz"
+        pkg_list="${pkg_list}${sep}${nam_gz[$i]}"
         sep=", "
     done
-    echo "Build packages ${pkg_list}."
+
+    echo "Build packages ${pkg_list} ."
     read -p "Proceed [y/n]: " a
     if [ "$a" != "y" -a  "$a" != "Y" ]; then
         exit 1
     fi
-    git archive --format=tar --prefix=brisk-${tag}/brisk/ $tag | gzip > ../$nam1
-    cd ../brisk-img
-    git archive --format=tar --prefix=brisk-${tag}/brisk-img/ $tag | gzip > ../$nam2
-    cd -
-    if [ -d ../curl-de-sac ]; then
-        cd ../curl-de-sac
-        git archive --format=tar --prefix=brisk-${tag}/curl-de-sac/ $tag | gzip > ../$nam3
+    for i in $( seq 0 $((${#nam[@]} - 1)) ); do
+        cd "../${nam[$i]}"
+        git archive --format=tar --prefix=brisk-${tag}/${nam[$i]}/ $tag | gzip > ../${nam_gz[$i]}
         cd -
-    fi
+    done
     exit 0
 fi
 
@@ -427,6 +424,12 @@ 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 ../fieldify ]; then
+    pw="$PWD"
+    cd ../fieldify
+    ./INSTALL.sh -s "$pw" -w ${web_path}__
+    cd - >/dev/null 2>&1
+fi
 if [ -d ../brisk-img ]; then
     cd ../brisk-img
     ./INSTALL.sh -w ${web_path}__