From 35fa479055645f7e5a8ec855b262a8e930cad7fb Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Thu, 6 Jul 2017 17:18:34 +0200 Subject: [PATCH] Fix to generate-blacklist not writing date into globalblacklist.conf --- travisCI/generate-blacklist.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/travisCI/generate-blacklist.sh b/travisCI/generate-blacklist.sh index 6224b6a11..c0541c360 100755 --- a/travisCI/generate-blacklist.sh +++ b/travisCI/generate-blacklist.sh @@ -36,9 +36,9 @@ MONTH=$(date +"%m") MY_GIT_TAG=V3.$YEAR.$MONTH.$TRAVIS_BUILD_NUMBER BAD_REFERRERS=$(wc -l < $TRAVIS_BUILD_DIR/_generator_lists/bad-referrers.list) BAD_BOTS=$(wc -l < $TRAVIS_BUILD_DIR/_generator_lists/bad-user-agents.list) -_now="$(date)" +#_now="$(date)" # To get DATE output into uppercase format (if needed) -#_now=$(date | tr -s '[:lower:]' '[:upper:]') +_NOW=$(date | tr -s '[:lower:]' '[:upper:]') # ************************************* @@ -388,7 +388,7 @@ rm $_inputdb10 # PRINT VERSION, SCRIPT RUNTIME and UPDATE INFORMATION INTO GLOBALBLACKLIST FILES # ******************************************************************************* -printf '%s\n%s\n%s%s\n%s%s\n%s%s\n%s%s\n%s\n%s\n' "$_startmarker" "###################################################" "### Version: " "$MY_GIT_TAG" "### Updated: " "$_now" "### Bad Referrer Count: " "$BAD_REFERRERS" "### Bad Bot Count: " "$BAD_BOTS" "###################################################" "$_endmarker" >> $_tmpnginxA +printf '%s\n%s\n%s%s\n%s%s\n%s%s\n%s%s\n%s\n%s\n' "$_startmarker" "###################################################" "### Version: " "$MY_GIT_TAG" "### Updated: " "$_NOW" "### Bad Referrer Count: " "$BAD_REFERRERS" "### Bad Bot Count: " "$BAD_BOTS" "###################################################" "$_endmarker" >> $_tmpnginxA mv $_tmpnginxA $_inputdbA ed -s $_inputdbA<<\IN 1,/### VERSION INFORMATION #/d