From: Matteo Nastasi (mop) Date: Thu, 20 Mar 2014 07:12:26 +0000 (+0100) Subject: add check between git tag and specified app version X-Git-Tag: v4.14.0~18 X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=b3b62ac96b554e6e893176d2e6f22ae660587b5c;p=brisk.git add check between git tag and specified app version --- diff --git a/INSTALL.sh b/INSTALL.sh index 1966eca..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 diff --git a/bin/points_test.sh b/bin/points_test.sh new file mode 100755 index 0000000..a54eabd --- /dev/null +++ b/bin/points_test.sh @@ -0,0 +1,3 @@ + ./builder.sh del sql.d/068-points-normalization.sql + ./builder.sh res sql.d/066-insert-unnorm-games.sql.test + ./builder.sh add sql.d/068-points-normalization.sql diff --git a/sql/sql.d/070-add-mailmgmt.sql b/sql/sql.d/070-add-mailmgmt.sql new file mode 100644 index 0000000..8f8057a --- /dev/null +++ b/sql/sql.d/070-add-mailmgmt.sql @@ -0,0 +1,13 @@ +-- +-- Table to manage mails sent to users +-- +DROP TABLE #PFX#mails; +CREATE TABLE #PFX#mails ( + code SERIAL PRIMARY KEY, + ucode integer REFERENCES #PFX#users (code) ON DELETE cascade ON UPDATE cascade, + type integer, -- type of email + tstamp timestamp DEFAULT to_timestamp(0), -- insert time + subj text, -- email subject + body_txt text, -- email body (text version) + body_htm text, -- email body (html version) + refs text); -- email references