X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=INSTALL.sh;h=2e934fe1de73726a7a69e28e1fbc91848d808c7f;hb=b3b62ac96b554e6e893176d2e6f22ae660587b5c;hp=aae8e21c12e1b790d867bcb7e4ff50bea2df5481;hpb=5fa01c83781bbb977710f84ec20ff882d59b8034;p=brisk.git diff --git a/INSTALL.sh b/INSTALL.sh index aae8e21..2e934fe 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -95,6 +95,14 @@ if [ "$1" = "chk" ]; then for i in $(find -name '*.pho' -o -name '*.phh' -o -name '*.php'); do php5 -l $i done + + taggit="$(git describe --tags | sed 's/^v//g')" + tagphp="$(grep "^\$G_brisk_version = " web/Obj/brisk.phh | sed 's/^[^"]\+"//g;s/".*//g')" + if [ "$taggit" != "v$tagphp" ]; then + echo + echo "WARNING: taggit: [$taggit] tagphp: [$tagphp]" + echo + fi exit 0 fi @@ -328,7 +336,7 @@ for i in $(find web -type d | sed 's/^....//g'); do install -d ${web_path}__/$i done -for i in $(find web -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*.txt' | sed 's/^....//g'); do +for i in $(find web -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 install -m 644 "web/$i" "${web_path}__/$i" done chmod 755 "${web_path}__/spush/brisk-spush.php" @@ -413,4 +421,10 @@ fi if [ "$web_only" = "FALSE" ]; then mv "$ftokk_path" "$ftok_path" fi +if [ -f WARNING.txt ]; then + echo ; echo " ==== WARNING ====" + echo + cat WARNING.txt + echo +fi exit 0