From 11daa4890dd9474b48cacfb6e3e1332d2ded0b2d Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Sun, 3 Jan 2021 22:39:36 +0100 Subject: [PATCH] Bashbot Version 1.21 (cleanup release) --- README.html | 2 +- README.md | 2 +- README.txt | 2 +- addons/antiFlood.sh | 2 +- addons/example.sh | 2 +- bashbot.rc | 2 +- bashbot.sh | 8 ++++---- bin/bashbot_env.inc.sh | 2 +- bin/bashbot_stats.sh | 2 +- bin/send_broadcast.sh | 2 +- bin/send_edit_message.sh | 2 +- bin/send_file.sh | 2 +- bin/send_message.sh | 2 +- commands.sh | 2 +- dev/all-tests.sh | 2 +- dev/git-add.sh | 2 +- dev/hooks/post-commit.sh | 2 +- dev/hooks/pre-commit.sh | 2 +- dev/hooks/pre-push.sh | 2 +- dev/inject-json.sh | 2 +- dev/install-hooks.sh | 2 +- dev/make-distribution.sh | 2 +- dev/make-html.sh | 2 +- dev/make-standalone.sh | 8 +++++--- dev/obfuscate.sh | 3 ++- dev/shellcheck.files | 2 +- dev/version.sh | 2 +- doc/0_install.md | 2 +- doc/1_firstbot.md | 2 +- doc/2_usage.md | 2 +- doc/3_advanced.md | 2 +- doc/4_expert.md | 2 +- doc/5_practice.md | 2 +- doc/6_reference.md | 14 +++++++++++++- doc/7_develop.md | 2 +- examples/README.md | 2 +- examples/background-scripts/run_diskusage.sh | 2 +- examples/background-scripts/run_filecontent.sh | 2 +- examples/background-scripts/run_filename.sh | 2 +- examples/background-scripts/run_notify.sh | 2 +- examples/bash2env.sh | 2 +- examples/bashbot-multi.sh | 2 +- examples/bashbot.cron | 2 +- examples/calc.sh | 2 +- examples/jsonDB-keyboard/mycommands.sh | 2 +- examples/notify.sh | 2 +- examples/question.sh | 2 +- examples/send-system-status/botacl | 2 +- examples/send-system-status/mycommands.sh | 2 +- modules/aliases.sh | 2 +- modules/answerInline.sh | 2 +- modules/background.sh | 2 +- modules/chatMember.sh | 2 +- modules/jsonDB.sh | 2 +- modules/sendMessage.sh | 2 +- mycommands.sh | 2 +- mycommands.sh.clean | 2 +- scripts/interactive.sh.clean | 2 +- test/ADD-test-new.sh | 2 +- test/ALL-tests.inc.sh | 2 +- test/a-commit-test.sh | 2 +- test/b-example-test.sh | 2 +- test/c-init-test.sh | 2 +- test/d-JSON.sh-test.sh | 2 +- test/d-process_inline-test.sh | 2 +- test/d-process_message-test.sh | 2 +- test/d-send_message-test.sh | 2 +- test/d-user_is-test.sh | 2 +- test/e-env-test.sh | 2 +- 69 files changed, 89 insertions(+), 74 deletions(-) diff --git a/README.html b/README.html index 1ee95b5..eafdc6a 100644 --- a/README.html +++ b/README.html @@ -390,6 +390,6 @@ It features background tasks and interactive chats, and can serve as an interfac

@Gnadelwartz

That's it all guys!

If you feel that there's something missing or if you found a bug, feel free to submit a pull request!

-

$$VERSION$$ v1.21-pre-28-g5415f28

+

$$VERSION$$ v1.21-0-gc85af77

diff --git a/README.md b/README.md index 76a6dcd..0b28c5d 100644 --- a/README.md +++ b/README.md @@ -238,4 +238,4 @@ See `mycommnds.sh.dist` for an example. If you feel that there's something missing or if you found a bug, feel free to submit a pull request! -#### $$VERSION$$ v1.21-pre-28-g5415f28 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/README.txt b/README.txt index 6131e54..f05309f 100644 --- a/README.txt +++ b/README.txt @@ -321,4 +321,4 @@ See `mycommnds.sh.dist` for an example. If you feel that there's something missing or if you found a bug, feel free to submit a pull request! -#### $$VERSION$$ v1.21-pre-28-g5415f28 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/addons/antiFlood.sh b/addons/antiFlood.sh index 0abdcb8..b014341 100644 --- a/addons/antiFlood.sh +++ b/addons/antiFlood.sh @@ -4,7 +4,7 @@ # this addon counts how many files, e.g. stickers, are sent to # a chat and takes actions if threshold is reached # -#### $$VERSION$$ v1.21-dev-44-gb04ee84 +#### $$VERSION$$ v1.21-0-gc85af77 # used events: # diff --git a/addons/example.sh b/addons/example.sh index 01ab6da..1cbf168 100644 --- a/addons/example.sh +++ b/addons/example.sh @@ -4,7 +4,7 @@ # Addons can register to bashbot events at startup # by providing their name and a callback per event # -#### $$VERSION$$ v1.21-dev-44-gb04ee84 +#### $$VERSION$$ v1.21-0-gc85af77 # # If an event occurs each registered event function is called. # diff --git a/bashbot.rc b/bashbot.rc index 8b79577..bf895c7 100755 --- a/bashbot.rc +++ b/bashbot.rc @@ -5,7 +5,7 @@ # # tested on: ubuntu, opensuse, debian # -#### $$VERSION$$ v1.21-pre-39-ge8aa80c +#### $$VERSION$$ v1.21-0-gc85af77 # shellcheck disable=SC2009 # shellcheck disable=SC2181 diff --git a/bashbot.sh b/bashbot.sh index df96237..8d7906f 100755 --- a/bashbot.sh +++ b/bashbot.sh @@ -30,7 +30,7 @@ # 8 - curl/wget missing # 10 - not bash! # -#### $$VERSION$$ v1.21-pre-28-g5415f28 +#### $$VERSION$$ v1.21-0-gc85af77 ################################################################## # emmbeded system may claim bash but it is not @@ -127,7 +127,7 @@ debug_checks(){ { } # some Linux distributions (e.g. Manjaro) doesn't seem to have C locale activated by default -if _exists locale && [ "$(locale -a | grep -c -e "^C$" -e "^C.utf8$")" -lt 2 ]; then +if _exists locale && [ "$(locale -a | grep -c -e "^C$" -e "^C.[uU][tT][fF]")" -lt 2 ]; then printf "${ORANGE}Warning: locale ${NC}${GREY}C${NC}${ORANGE} and/or ${NC}${GREY}C.utf8${NC}${ORANGE} seems missing, use \"${NC}${GREY}locale -a${NC}${ORANGE}\" to show what locales are installed on your system.${NN}" fi @@ -1289,14 +1289,14 @@ if [ -z "${SOURCE}" ]; then ;; *) printf "${RED}${REALME##*/}: unknown command${NN}" - printf "${RED}Available commands: ${GREY}${BOTCOMMANDS}${NN}" && exit + printf "${ORANGE}Available commands: ${GREY}${BOTCOMMANDS}${NN}" && exit exit 4 ;; esac # warn if root if [[ "${UID}" -eq "0" ]] ; then - printf "\\n${ORANGE}WARNING: ${SCRIPT} was started as ROOT (UID 0)!${NN}" + printf "\n${ORANGE}WARNING: ${SCRIPT} was started as ROOT (UID 0)!${NN}" printf "${ORANGE}You are at HIGH RISK when running a Telegram BOT with root privileges!${NN}" fi fi # end source diff --git a/bin/bashbot_env.inc.sh b/bin/bashbot_env.inc.sh index 3ea6349..f1da22b 100644 --- a/bin/bashbot_env.inc.sh +++ b/bin/bashbot_env.inc.sh @@ -13,7 +13,7 @@ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 18.12.2020 12:27 # -#### $$VERSION$$ v1.21-pre-43-gbbdeb8b +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== ############ diff --git a/bin/bashbot_stats.sh b/bin/bashbot_stats.sh index f0669f2..ddf34d6 100755 --- a/bin/bashbot_stats.sh +++ b/bin/bashbot_stats.sh @@ -16,7 +16,7 @@ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 23.12.2020 20:34 # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== #### diff --git a/bin/send_broadcast.sh b/bin/send_broadcast.sh index 0af5c03..2d38083 100755 --- a/bin/send_broadcast.sh +++ b/bin/send_broadcast.sh @@ -24,7 +24,7 @@ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 16.12.2020 16:14 # -#### $$VERSION$$ v1.20-3-g232a16b +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # shellcheck disable=SC2059 diff --git a/bin/send_edit_message.sh b/bin/send_edit_message.sh index 75e9325..ef99801 100755 --- a/bin/send_edit_message.sh +++ b/bin/send_edit_message.sh @@ -22,7 +22,7 @@ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 23.12.2020 16:52 # -#### $$VERSION$$ v1.21-dev-0-g2e878fd +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== #### diff --git a/bin/send_file.sh b/bin/send_file.sh index d513983..04d6261 100755 --- a/bin/send_file.sh +++ b/bin/send_file.sh @@ -21,7 +21,7 @@ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 25.12.2020 20:24 # -#### $$VERSION$$ v1.21-dev-0-g2e878fd +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== #### diff --git a/bin/send_message.sh b/bin/send_message.sh index 0d95d5f..47fac76 100755 --- a/bin/send_message.sh +++ b/bin/send_message.sh @@ -21,7 +21,7 @@ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 16.12.2020 11:34 # -#### $$VERSION$$ v1.21-dev-0-g2e878fd +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== #### diff --git a/commands.sh b/commands.sh index 4b3356c..6d76673 100644 --- a/commands.sh +++ b/commands.sh @@ -15,7 +15,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.21-dev-23-g1a0b51d +#### $$VERSION$$ v1.21-0-gc85af77 # # adjust your language setting here, e.g. when run from other user or cron. diff --git a/dev/all-tests.sh b/dev/all-tests.sh index fffc964..4923962 100755 --- a/dev/all-tests.sh +++ b/dev/all-tests.sh @@ -5,7 +5,7 @@ # # Description: run all tests, exit after failed test # -#### $$VERSION$$ v1.21-pre-45-gfc847c3 +#### $$VERSION$$ v1.21-0-gc85af77 ############################################################# # magic to ensure that we're always inside the root of our application, diff --git a/dev/git-add.sh b/dev/git-add.sh index 9a1d608..1a6f337 100755 --- a/dev/git-add.sh +++ b/dev/git-add.sh @@ -3,7 +3,7 @@ # # works together with git pre-push.sh and ADD all changed files since last push -#### $$VERSION$$ v1.21-pre-45-gfc847c3 +#### $$VERSION$$ v1.21-0-gc85af77 # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script diff --git a/dev/hooks/post-commit.sh b/dev/hooks/post-commit.sh index 227d06d..e8ad88c 100755 --- a/dev/hooks/post-commit.sh +++ b/dev/hooks/post-commit.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.21-pre-4-g3193169 +#### $$VERSION$$ v1.21-0-gc85af77 ############ # NOTE: you MUST run install-hooks.sh again when updating this file! diff --git a/dev/hooks/pre-commit.sh b/dev/hooks/pre-commit.sh index e098eab..8880d05 100755 --- a/dev/hooks/pre-commit.sh +++ b/dev/hooks/pre-commit.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.21-pre-4-g3193169 +#### $$VERSION$$ v1.21-0-gc85af77 ############ # NOTE: you MUST run install-hooks.sh again when updating this file! diff --git a/dev/hooks/pre-push.sh b/dev/hooks/pre-push.sh index 96f6687..26f4658 100755 --- a/dev/hooks/pre-push.sh +++ b/dev/hooks/pre-push.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.21-pre-4-g3193169 +#### $$VERSION$$ v1.21-0-gc85af77 ############ # NOTE: you MUST run install-hooks.sh again when updating this file! diff --git a/dev/inject-json.sh b/dev/inject-json.sh index 7893c85..f470500 100644 --- a/dev/inject-json.sh +++ b/dev/inject-json.sh @@ -7,7 +7,7 @@ # # Usage: source inject-json.sh # -#### $$VERSION$$ v1.21-dev-22-ga3efcd2 +#### $$VERSION$$ v1.21-0-gc85af77 ############################################################## # download JSON.sh diff --git a/dev/install-hooks.sh b/dev/install-hooks.sh index a66a988..d004ec8 100755 --- a/dev/install-hooks.sh +++ b/dev/install-hooks.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # this has to run once atfer git clone # and every time we create new hooks -#### $$VERSION$$ v1.21-pre-3-gbbbf57c +#### $$VERSION$$ v1.21-0-gc85af77 # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh index 6c53f13..f67a85b 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -7,7 +7,7 @@ # # Options: --notest - skip tests # -#### $$VERSION$$ v1.21-pre-45-gfc847c3 +#### $$VERSION$$ v1.21-0-gc85af77 ############################################################## # magic to ensure that we're always inside the root of our application, diff --git a/dev/make-html.sh b/dev/make-html.sh index ad552c4..c8be7e8 100644 --- a/dev/make-html.sh +++ b/dev/make-html.sh @@ -7,7 +7,7 @@ # # Usage: source make-hmtl # -#### $$VERSION$$ v1.21-pre-3-gbbbf57c +#### $$VERSION$$ v1.21-0-gc85af77 ############################################################## # check for correct dir diff --git a/dev/make-standalone.sh b/dev/make-standalone.sh index 7d24a0a..edcf64b 100755 --- a/dev/make-standalone.sh +++ b/dev/make-standalone.sh @@ -9,7 +9,7 @@ # If you your bot is finished you can use make-standalone.sh to create the # the old all-in-one bashbot: bashbot.sh and commands.sh only! # -#### $$VERSION$$ v1.21-pre-45-gfc847c3 +#### $$VERSION$$ v1.21-0-gc85af77 ################################################################### # magic to ensure that we're always inside the root of our application, @@ -84,9 +84,11 @@ chmod +x bashbot.sh rm -rf modules printf "Create minimized Version of bashbot.sh and commands.sh\n" -sed -E -e '/(shellcheck)|(#!\/bin\/bash)/! s/^[[:space:]]*#.*//' -e 's/^[[:space:]]*//' -e '/^$/d' -e 'N;s/\\\n/ /;P;D' bashbot.sh |\ +# shellcheck disable=SC2016 +sed -E -e '/(shellcheck)|(^#!\/)|(\$\$VERSION\$\$)/! s/^[[:space:]]*#.*//' -e 's/^[[:space:]]*//' -e '/^$/d' -e 'N;s/\\\n/ /;P;D' bashbot.sh |\ sed 'N;s/\\\n/ /;P;D' > bashbot.sh.min -sed -E -e '/(shellcheck)|(#!\/bin\/bash)/! s/^[[:space:]]*#.*//' -e 's/^[[:space:]]*//' -e 's/\)[[:space:]]+#.*/)/' -e '/^$/d' commands.sh |\ +# shellcheck disable=SC2016 +sed -E -e '/(shellcheck)|(^#!\/)|(\$\$VERSION\$\$)/! s/^[[:space:]]*#.*//' -e 's/^[[:space:]]*//' -e 's/\)[[:space:]]+#.*/)/' -e '/^$/d' commands.sh |\ sed 'N;s/\\\n/ /;P;D' > commands.sh.min chmod +x bashbot.sh.min diff --git a/dev/obfuscate.sh b/dev/obfuscate.sh index 0eb59d8..2db4016 100755 --- a/dev/obfuscate.sh +++ b/dev/obfuscate.sh @@ -2,6 +2,7 @@ # # joke hack to obfuscate bashbot.min.sh # +#### $$VERSION$$ v1.21-0-gc85af77 # shellcheck disable=SC2028,SC2016,SC1117 infile="bashbot.sh" @@ -15,7 +16,7 @@ fi { # shellcheck disable=SC2183 printf '#!/bin/bash\na="$PWD";cd "$(mktemp -d)"||exit;%s'\ - 'printf '"'$(gzip -9 a;export BASHBOT_HOME="$a";chmod +x a;./a "$@";a="$PWD";cd ..;rm -rf "$a"' + 'printf '"'$(gzip -9 <"${infile}" | base64)'"'|base64 -d|gunzip >a;export BASHBOT_HOME="$a";chmod +x a;./a "$@";a="$PWD";cd ..;rm -rf "$a"' } >"${outfile}" chmod +x "${outfile}" diff --git a/dev/shellcheck.files b/dev/shellcheck.files index 8702171..0f99ebf 100644 --- a/dev/shellcheck.files +++ b/dev/shellcheck.files @@ -1,4 +1,4 @@ # list of additional files to check from shellcheck -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 bashbot.rc mycommands.sh.clean diff --git a/dev/version.sh b/dev/version.sh index 6314d28..eb759d4 100755 --- a/dev/version.sh +++ b/dev/version.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#### $$VERSION$$ v1.21-pre-3-gbbbf57c +#### $$VERSION$$ v1.21-0-gc85af77 # shellcheck disable=SC2016 # # Easy Versioning in git: diff --git a/doc/0_install.md b/doc/0_install.md index 100daa4..20a1f90 100644 --- a/doc/0_install.md +++ b/doc/0_install.md @@ -131,5 +131,5 @@ You must update to [Version 1.20](https://github.com/topkecleon/telegram-bot-bas #### [Next Create Bot](1_firstbot.md) -#### $$VERSION$$ v1.21-dev-41-g41378f8 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/doc/1_firstbot.md b/doc/1_firstbot.md index 303821a..4a67e48 100644 --- a/doc/1_firstbot.md +++ b/doc/1_firstbot.md @@ -65,5 +65,5 @@ group. This step is up to you actually. #### [Prev Installation](0_install.md) #### [Next Getting started](2_usage.md) -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/doc/2_usage.md b/doc/2_usage.md index a8d0490..e8a39e3 100644 --- a/doc/2_usage.md +++ b/doc/2_usage.md @@ -341,5 +341,5 @@ send_action "${CHAT[ID]}" "action" #### [Prev Create Bot](1_firstbot.md) #### [Next Advanced Usage](3_advanced.md) -#### $$VERSION$$ v1.21-dev-28-g43f5536 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/doc/3_advanced.md b/doc/3_advanced.md index 45aee2f..efa507f 100644 --- a/doc/3_advanced.md +++ b/doc/3_advanced.md @@ -301,5 +301,5 @@ Note: If you disable automatic retry, se above, you disable also connection prob #### [Prev Getting started](2_usage.md) #### [Next Expert Use](4_expert.md) -#### $$VERSION$$ v1.21-dev-29-g13d15f4 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/doc/4_expert.md b/doc/4_expert.md index f01c5a0..19a4171 100644 --- a/doc/4_expert.md +++ b/doc/4_expert.md @@ -378,5 +378,5 @@ for every poll until the maximum of BASHBOT_SLEEP ms. #### [Prev Advanced Use](3_advanced.md) #### [Next Best Practice](5_practice.md) -#### $$VERSION$$ v1.21-pre-28-g5415f28 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/doc/5_practice.md b/doc/5_practice.md index c0bd3cf..dd39426 100644 --- a/doc/5_practice.md +++ b/doc/5_practice.md @@ -160,5 +160,5 @@ The second warning is about an unused variable, this is true because in our exam #### [Prev Best Practice](5_practice.md) #### [Next Functions Reference](6_reference.md) -#### $$VERSION$$ v1.21-dev-29-g13d15f4 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/doc/6_reference.md b/doc/6_reference.md index 53ec80d..cca5abd 100644 --- a/doc/6_reference.md +++ b/doc/6_reference.md @@ -634,6 +634,18 @@ cat file.jssh ``` +*Hint*: Try `tr -dc "[:alnum:],.\r\n"` to strip invalid characters from key. +```bash +# strip key containing invalid characters +KEY="123abcABC,.#?(<>123ÄÖ*%&§" +OK_KEY="$(tr -dc "[:alnum:],.\r\n" <<<"${KEY}")" + +# show stripped key +printf "%s\n" "${OK_KEY}" + +123abcABC,.123 +``` + #### File naming and locking A jssh fileDB consists of two files and must reside inside `BASHBOT_ETC` or `BASHBOT_DATA`. @@ -1175,5 +1187,5 @@ The name of your bot is available as bash variable "$ME", there is no need to ca #### [Prev Best Practice](5_practice.md) #### [Next Notes for Developers](7_develop.md) -#### $$VERSION$$ v1.21-pre-44-ge0597ad +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/doc/7_develop.md b/doc/7_develop.md index f6bb599..eb12beb 100644 --- a/doc/7_develop.md +++ b/doc/7_develop.md @@ -358,5 +358,5 @@ fi #### [Prev Function Reference](6_reference.md) -#### $$VERSION$$ v1.21-pre-28-g5415f28 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/examples/README.md b/examples/README.md index b642c54..5ac3794 100644 --- a/examples/README.md +++ b/examples/README.md @@ -56,6 +56,6 @@ convert existing bots. **jsonDB-keybords** contains a stripped down real world example from my bot showing the usage of jsonDB to store and retrieve values plus use of keyboards in private chats. It's an extended version of mycommands.sh.dist. Messages and help are in german. -#### $$VERSION$$ v1.21-pre-14-ga93dc56 +#### $$VERSION$$ v1.21-0-gc85af77 diff --git a/examples/background-scripts/run_diskusage.sh b/examples/background-scripts/run_diskusage.sh index 08eefe5..eadbfbe 100755 --- a/examples/background-scripts/run_diskusage.sh +++ b/examples/background-scripts/run_diskusage.sh @@ -4,7 +4,7 @@ # # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) -#### $$VERSION$$ v1.21-pre-13-g9cca55b +#### $$VERSION$$ v1.21-0-gc85af77 ###### # parameters diff --git a/examples/background-scripts/run_filecontent.sh b/examples/background-scripts/run_filecontent.sh index 9be667b..04cbfdd 100755 --- a/examples/background-scripts/run_filecontent.sh +++ b/examples/background-scripts/run_filecontent.sh @@ -2,7 +2,7 @@ # file: run_filename # background job to display content of all new files in WATCHDIR # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 ###### # parameters diff --git a/examples/background-scripts/run_filename.sh b/examples/background-scripts/run_filename.sh index cc0fd09..1b562e6 100755 --- a/examples/background-scripts/run_filename.sh +++ b/examples/background-scripts/run_filename.sh @@ -2,7 +2,7 @@ # file: run_filename # background job to display all new files in WATCHDIR # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 ###### # parameters diff --git a/examples/background-scripts/run_notify.sh b/examples/background-scripts/run_notify.sh index 65fe18f..67cf313 100755 --- a/examples/background-scripts/run_notify.sh +++ b/examples/background-scripts/run_notify.sh @@ -4,7 +4,7 @@ # # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 ###### # parameters diff --git a/examples/bash2env.sh b/examples/bash2env.sh index d4cafc5..2870fcc 100755 --- a/examples/bash2env.sh +++ b/examples/bash2env.sh @@ -6,7 +6,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # shellcheck disable=SC1117 -#### $$VERSION$$ v1.21-pre-28-g5415f28 +#### $$VERSION$$ v1.21-0-gc85af77 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/examples/bashbot-multi.sh b/examples/bashbot-multi.sh index db4ef0c..a0b3951 100755 --- a/examples/bashbot-multi.sh +++ b/examples/bashbot-multi.sh @@ -2,7 +2,7 @@ # file. multibot.sh # description: run multiple telegram bots from one installation # -#### $$VERSION$$ v1.21-pre-28-g5415f28 +#### $$VERSION$$ v1.21-0-gc85af77 if [ "${2}" = "" ] || [ "${2}" = "-h" ]; then echo "Usage: $0 botname command" diff --git a/examples/bashbot.cron b/examples/bashbot.cron index 917c32f..cdf5629 100644 --- a/examples/bashbot.cron +++ b/examples/bashbot.cron @@ -7,7 +7,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.21-pre-14-ga93dc56 +#### $$VERSION$$ v1.21-0-gc85af77 SHELL=/bin/sh diff --git a/examples/calc.sh b/examples/calc.sh index 7b0dab1..72f94f6 100755 --- a/examples/calc.sh +++ b/examples/calc.sh @@ -11,7 +11,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.21-pre-14-ga93dc56 +#### $$VERSION$$ v1.21-0-gc85af77 ######################################################################## ###### diff --git a/examples/jsonDB-keyboard/mycommands.sh b/examples/jsonDB-keyboard/mycommands.sh index b7d1f82..2352974 100644 --- a/examples/jsonDB-keyboard/mycommands.sh +++ b/examples/jsonDB-keyboard/mycommands.sh @@ -10,7 +10,7 @@ # AUTHOR: KayM (), kay@rrr.de # DATE: 19.12.2020 19:03 # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # shellcheck disable=SC2154 # shellcheck disable=SC2034 diff --git a/examples/notify.sh b/examples/notify.sh index 53e483d..2cc2678 100755 --- a/examples/notify.sh +++ b/examples/notify.sh @@ -13,7 +13,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.21-pre-14-ga93dc56 +#### $$VERSION$$ v1.21-0-gc85af77 ######################################################################## ###### diff --git a/examples/question.sh b/examples/question.sh index 71ff11f..17479b0 100755 --- a/examples/question.sh +++ b/examples/question.sh @@ -10,7 +10,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.21-pre-14-ga93dc56 +#### $$VERSION$$ v1.21-0-gc85af77 ######################################################################## ###### diff --git a/examples/send-system-status/botacl b/examples/send-system-status/botacl index 392dbaa..0d4c3a1 100644 --- a/examples/send-system-status/botacl +++ b/examples/send-system-status/botacl @@ -1,7 +1,7 @@ # file: botacl # a user not listed here, will return false from 'user_is_allowed' # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 # Format: # user:resource:chat diff --git a/examples/send-system-status/mycommands.sh b/examples/send-system-status/mycommands.sh index 9ccc8c4..2704143 100644 --- a/examples/send-system-status/mycommands.sh +++ b/examples/send-system-status/mycommands.sh @@ -5,7 +5,7 @@ # to show how you can customize bashbot by only editing mycommands.sh # NOTE: this is not tested, simply copied from original source and reworked! # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 # # shellcheck disable=SC2154 # shellcheck disable=SC2034 diff --git a/modules/aliases.sh b/modules/aliases.sh index 310d2f9..a160db0 100644 --- a/modules/aliases.sh +++ b/modules/aliases.sh @@ -5,7 +5,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 # # will be automatically sourced from bashbot diff --git a/modules/answerInline.sh b/modules/answerInline.sh index b010cb1..83534da 100644 --- a/modules/answerInline.sh +++ b/modules/answerInline.sh @@ -5,7 +5,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 # will be automatically sourced from bashbot diff --git a/modules/background.sh b/modules/background.sh index 06a680c..5e0513b 100644 --- a/modules/background.sh +++ b/modules/background.sh @@ -6,7 +6,7 @@ # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # # shellcheck disable=SC1117,SC2059 -#### $$VERSION$$ v1.21-dev-1-g03bdecb +#### $$VERSION$$ v1.21-0-gc85af77 # will be automatically sourced from bashbot diff --git a/modules/chatMember.sh b/modules/chatMember.sh index da6bc11..4f23645 100644 --- a/modules/chatMember.sh +++ b/modules/chatMember.sh @@ -5,7 +5,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-0-gc85af77 # will be automatically sourced from bashbot diff --git a/modules/jsonDB.sh b/modules/jsonDB.sh index 4e060f6..90f11f9 100644 --- a/modules/jsonDB.sh +++ b/modules/jsonDB.sh @@ -5,7 +5,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.21-dev-33-gd083390 +#### $$VERSION$$ v1.21-0-gc85af77 # # source from commands.sh to use jsonDB functions # diff --git a/modules/sendMessage.sh b/modules/sendMessage.sh index f8d4baa..e5ef612 100644 --- a/modules/sendMessage.sh +++ b/modules/sendMessage.sh @@ -6,7 +6,7 @@ # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # # shellcheck disable=SC1117 -#### $$VERSION$$ v1.21-dev-29-g13d15f4 +#### $$VERSION$$ v1.21-0-gc85af77 # will be automatically sourced from bashbot diff --git a/mycommands.sh b/mycommands.sh index b7c5327..e5acad7 100644 --- a/mycommands.sh +++ b/mycommands.sh @@ -9,7 +9,7 @@ # #### mycommands.clean # # shellcheck disable=SC1117 -#### $$VERSION$$ v1.21-pre-40-gf95e214 +#### $$VERSION$$ v1.21-0-gc85af77 # # uncomment the following lines to overwrite info and help messages diff --git a/mycommands.sh.clean b/mycommands.sh.clean index f248f16..f8abce8 100644 --- a/mycommands.sh.clean +++ b/mycommands.sh.clean @@ -4,7 +4,7 @@ # files: mycommands.sh.clean # copy to mycommands.sh and add all your commands and functions here ... # -#### $$VERSION$$ v1.21-pre-40-gf95e214 +#### $$VERSION$$ v1.21-0-gc85af77 # ########## diff --git a/scripts/interactive.sh.clean b/scripts/interactive.sh.clean index 0a9745d..6d710bd 100755 --- a/scripts/interactive.sh.clean +++ b/scripts/interactive.sh.clean @@ -6,7 +6,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.21-pre-42-g64400cd +#### $$VERSION$$ v1.21-0-gc85af77 ###### # parameters diff --git a/test/ADD-test-new.sh b/test/ADD-test-new.sh index 163366b..f51e935 100755 --- a/test/ADD-test-new.sh +++ b/test/ADD-test-new.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-38-gf7b5c19 +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # magic to ensure that we're always inside the root of our application, diff --git a/test/ALL-tests.inc.sh b/test/ALL-tests.inc.sh index db3b836..2431581 100644 --- a/test/ALL-tests.inc.sh +++ b/test/ALL-tests.inc.sh @@ -11,7 +11,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-33-g16e2077 +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # common variables diff --git a/test/a-commit-test.sh b/test/a-commit-test.sh index 1a451c9..1e97b94 100755 --- a/test/a-commit-test.sh +++ b/test/a-commit-test.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-35-g32b99dc +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== ../dev/hooks/pre-commit.sh diff --git a/test/b-example-test.sh b/test/b-example-test.sh index 533a30b..1e54f0c 100644 --- a/test/b-example-test.sh +++ b/test/b-example-test.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-35-g32b99dc +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # include common functions and definitions diff --git a/test/c-init-test.sh b/test/c-init-test.sh index ce2155a..8dd7057 100755 --- a/test/c-init-test.sh +++ b/test/c-init-test.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-36-g0dfbf7b +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # include common functions and definitions diff --git a/test/d-JSON.sh-test.sh b/test/d-JSON.sh-test.sh index 8c0baf0..8d2b988 100755 --- a/test/d-JSON.sh-test.sh +++ b/test/d-JSON.sh-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.21-pre-41-g9acb2cd +#### $$VERSION$$ v1.21-0-gc85af77 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh diff --git a/test/d-process_inline-test.sh b/test/d-process_inline-test.sh index 11f4b83..e5f0635 100755 --- a/test/d-process_inline-test.sh +++ b/test/d-process_inline-test.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-36-g0dfbf7b +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # include common functions and definitions diff --git a/test/d-process_message-test.sh b/test/d-process_message-test.sh index b639985..14e4a48 100755 --- a/test/d-process_message-test.sh +++ b/test/d-process_message-test.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-37-g7e1c1b5 +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # include common functions and definitions diff --git a/test/d-send_message-test.sh b/test/d-send_message-test.sh index 1b5c125..5a7d131 100755 --- a/test/d-send_message-test.sh +++ b/test/d-send_message-test.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-37-g7e1c1b5 +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # include common functions and definitions diff --git a/test/d-user_is-test.sh b/test/d-user_is-test.sh index 363dd4e..5cee920 100755 --- a/test/d-user_is-test.sh +++ b/test/d-user_is-test.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-38-gf7b5c19 +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # include common functions and definitions diff --git a/test/e-env-test.sh b/test/e-env-test.sh index adec3e8..17fc8df 100755 --- a/test/e-env-test.sh +++ b/test/e-env-test.sh @@ -10,7 +10,7 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-38-gf7b5c19 +#### $$VERSION$$ v1.21-0-gc85af77 #=============================================================================== # include common functions and definitions