From da3a5c4394ca298a68e367859ef226e6bcc3b873 Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Fri, 23 May 2014 08:34:13 +0200 Subject: [PATCH] fix on version check, better check of config differences, cleanup of G_mail_domain var --- INSTALL.sh | 4 ++-- web/index_wr.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.sh b/INSTALL.sh index cef7ff5..5865661 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -99,7 +99,7 @@ if [ "$1" = "chk" ]; then 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 + if [ "$taggit" != "$tagphp" ]; then echo echo "WARNING: taggit: [$taggit] tagphp: [$tagphp]" echo @@ -416,7 +416,7 @@ if [ -f "$etc_path/$brisk_conf" ]; then echo "Config file $etc_path/$brisk_conf exists." echo "=== Dump the diff. ===" # diff -u "$etc_path/$brisk_conf" "${web_path}__""/Obj/brisk.conf-templ.pho" - diff -u <(cat "$etc_path/$brisk_conf" | grep '\$[a-zA-Z_ ]\+=' | sed 's/ = .*/ = /g' | sort | uniq) <(cat "${web_path}__""/Obj/brisk.conf-templ.pho" | grep '\$[a-zA-Z_ ]\+=' | sed 's/ = .*/ = /g' | sort | uniq ) + diff -u <(cat "$etc_path/$brisk_conf" | egrep -v '^//|^#' | grep '\$[a-zA-Z_ ]\+=' | sed 's/ \+= .*/ = /g' | sort | uniq) <(cat "${web_path}__""/Obj/brisk.conf-templ.pho" | egrep -v '^//|^#' | grep '\$[a-zA-Z_ ]\+=' | sed 's/ \+= .*/ = /g' | sort | uniq ) echo "=== End dump. ===" else echo "Config file $etc_path/$brisk_conf not exists." diff --git a/web/index_wr.php b/web/index_wr.php index 76ffb7c..d8a1d65 100644 --- a/web/index_wr.php +++ b/web/index_wr.php @@ -119,7 +119,7 @@ define('LICMGR_CHO_AFTER', 2); function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) { - GLOBAL $G_domain, $G_webbase, $G_mail_domain, $G_mail_seed; + GLOBAL $G_domain, $G_webbase, $G_mail_seed; GLOBAL $G_shutdown, $G_alarm_passwd, $G_black_list, $G_lang, $G_room_help, $G_room_about; GLOBAL $G_room_passwdhowto, $mlang_indwr; GLOBAL $G_tos_vers; -- 2.17.1