diff --git a/AUTO-CONFIGURATION.md b/AUTO-CONFIGURATION.md index 1f4d7408a..51a19aee1 100644 --- a/AUTO-CONFIGURATION.md +++ b/AUTO-CONFIGURATION.md @@ -3,7 +3,12 @@ ##### Created by: https://github.com/mitchellkrogza ##### Copyright Mitchell Krog -### Version 3.2017.07 + +##### Version Information # +******************************************** +# Version: V3.2017.06.540 +******************************************** +##### Version Information ## ## Update Notification System diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md index 5f2d129df..1b7adc06e 100644 --- a/MANUAL-CONFIGURATION.md +++ b/MANUAL-CONFIGURATION.md @@ -3,7 +3,12 @@ ##### Created by: https://github.com/mitchellkrogza ##### Copyright Mitchell Krog -### Version 3.2017.07 + +##### Version Information # +******************************************** +# Version: V3.2017.06.540 +******************************************** +##### Version Information ## ## Update Notification System diff --git a/composer.json b/composer.json deleted file mode 100644 index 6a6a6d20c..000000000 --- a/composer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "mitchellkrogza/nginx-ultimate-bad-bot-blocker", - "description": "Travis CI Testing for the Nginx Ultimate Bad Bot Blocker", - "license": "MIT", - "authors": [ - { - "name": "Mitchell Krog", - "email": "mitchellkrog@gmail.com" - } - ], - "require": { - "php": ">=5.4.0", - "lib-curl": "*" - } -} diff --git a/travisCI/change-file.sh b/travisCI/change-file.sh index c75caeb3c..4861cc8ab 100755 --- a/travisCI/change-file.sh +++ b/travisCI/change-file.sh @@ -27,6 +27,8 @@ sudo chown -R travis:travis $TRAVIS_BUILD_DIR/* # Add the modified file to the and commit it git add $TRAVIS_BUILD_DIR/README.md +git add $TRAVIS_BUILD_DIR/AUTO-CONFIGURATION.md +git add $TRAVIS_BUILD_DIR/MANUAL-CONFIGURATION.md git add $TRAVIS_BUILD_DIR/conf.d/globalblacklist.conf git add $TRAVIS_BUILD_DIR/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf git commit -am "V3.$YEAR.$MONTH.$TRAVIS_BUILD_NUMBER [ci skip]" diff --git a/travisCI/modify-readme.sh b/travisCI/modify-readme.sh index b21d6b701..1d8fa12be 100755 --- a/travisCI/modify-readme.sh +++ b/travisCI/modify-readme.sh @@ -44,5 +44,59 @@ q IN rm $_inputdbA +# PRINT VERSION INFORMATION INTO AUTO-CONFIGURATION.md +# **************************************************** +LASTUPDATEIFS2=$IFS +IFS=$'\n' +now="$(date)" +end=$(date +%s.%N) +echo $_startmarker >> $_tmpnginxA +runtime=$(python -c "print(${end} - ${start})") +printf "********************************************\n# Version: "$MY_GIT_TAG"\n********************************************\n" >> $_tmpnginxA +echo $_endmarker >> $_tmpnginxA +IFS=$LASTUPDATEIFS2 +mv $_tmpnginxA $_inputdbA +ed -s $_inputdbA<<\IN +1,/##### Version Information #/d +/##### Version Information ##/,$d +,d +.r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/AUTO-CONFIGURATION.md +/##### Version Information #/x +.t. +.,/##### Version Information ##/-d +#,p +#,p used to print output replaced with w below to write +w /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/AUTO-CONFIGURATION.md +q +IN +rm $_inputdbA + +# PRINT VERSION INFORMATION INTO MANUAL-CONFIGURATION.md +# ****************************************************** +LASTUPDATEIFS3=$IFS +IFS=$'\n' +now="$(date)" +end=$(date +%s.%N) +echo $_startmarker >> $_tmpnginxA +runtime=$(python -c "print(${end} - ${start})") +printf "********************************************\n# Version: "$MY_GIT_TAG"\n********************************************\n" >> $_tmpnginxA +echo $_endmarker >> $_tmpnginxA +IFS=$LASTUPDATEIFS3 +mv $_tmpnginxA $_inputdbA +ed -s $_inputdbA<<\IN +1,/##### Version Information #/d +/##### Version Information ##/,$d +,d +.r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/MANUAL-CONFIGURATION.md +/##### Version Information #/x +.t. +.,/##### Version Information ##/-d +#,p +#,p used to print output replaced with w below to write +w /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/MANUAL-CONFIGURATION.md +q +IN +rm $_inputdbA + exit 0