From 7aa409fbc8863b940c39d64ada79474ac97e019c Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Sun, 17 May 2020 13:51:32 +0200 Subject: [PATCH] Version 0.94 --- README.html | 6 ++++- README.md | 11 ++++++++- README.txt | 14 ++++++++++- addons/antiFlood.sh | 2 +- addons/example.sh | 2 +- bashbot.rc | 2 +- bashbot.sh | 2 +- commands.sh | 2 +- dev/all-tests.sh | 2 +- dev/git-add.sh | 2 +- dev/hooks/pre-commit.sh | 2 +- dev/hooks/pre-push.sh | 2 +- dev/install-hooks.sh | 2 +- dev/make-distribution.sh | 2 +- dev/make-standalone.sh | 2 +- dev/shellcheck.files | 2 +- dev/version.sh | 2 +- doc/0_install.md | 23 +++++++++---------- 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 | 2 +- doc/7_develop.md | 2 +- examples/README.md | 2 +- examples/background-scripts/run_diskusage.sh | 2 +- .../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/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 +- 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 +- 57 files changed, 92 insertions(+), 68 deletions(-) diff --git a/README.html b/README.html index 76d5471..fd03b66 100644 --- a/README.html +++ b/README.html @@ -179,6 +179,10 @@ It features background tasks and interactive chats, and can serve as an interfac

Bash scripts in general are not designed to be bullet proof, so consider this Bot as a proof of concept. Bash programmers often struggle with 'quoting hell' and globbing, see Implications of wrong quoting

Whenever you are processing input from from untrusted sources (messages, files, network) you must be as carefull as possible, e.g. set IFS appropriate, disable globbing (set -f) and quote everthing. In addition delete unused scripts and examples from your Bot, e.g. scripts 'notify', 'calc', 'question', and disable all not used commands.

A powerful tool to improve your scripts is shellcheck. You can use it online or install shellcheck locally. Shellcheck is used extensive in bashbot development to enshure a high code quality, e.g. it's not allowed to push changes without passing all shellcheck tests. In addition bashbot has a test suite to check if important functionality is working as expected.

+

Do not use #!/usr/bin/env bash

+

We stay with /bin/bash shebang, because using the system bash is more save from security perspective.

+

It makes it harder for attackers and users to place alternative versions of bash and avoids using possibly broken, mangled or compromised bash executables.

+

If you are a MacOS user or forced to use an alternative bash, see Install Bashbot

Run your Bot as a restricted user

I recommend to run your bot as a user, with almost no access rights. All files your Bot have write access to are in danger to be overwritten/deleted if your bot is hacked. For the same reason ervery file your Bot can read is in danger to be disclosed. Restict your Bots access rigths to the absolute minimum.

Never run your Bot as root, this is the most dangerous you can do! Usually the user 'nobody' has almost no rights on Unix/Linux systems. See Expert use on how to run your Bot as an other user.

@@ -224,6 +228,6 @@ It features background tasks and interactive chats, and can serve as an interfac

@Gnadelwartz

That's it!

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

-

$$VERSION$$ v0.94-5-g6531fec

+

$$VERSION$$ V0.94-0-gbdb50c8

diff --git a/README.md b/README.md index 535e6f0..23d6cd8 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,15 @@ Whenever you are processing input from from untrusted sources (messages, files, A powerful tool to improve your scripts is ```shellcheck```. You can [use it online](https://www.shellcheck.net/) or [install shellcheck locally](https://github.com/koalaman/shellcheck#installing). Shellcheck is used extensive in bashbot development to enshure a high code quality, e.g. it's not allowed to push changes without passing all shellcheck tests. In addition bashbot has a [test suite](doc/7_develop.md) to check if important functionality is working as expected. +### Do not use #!/usr/bin/env bash + +We stay with /bin/bash shebang, because using the system bash is more save from security perspective. + +It makes it harder for attackers and users to place alternative versions of bash and avoids using +possibly broken, mangled or compromised bash executables. + +If you are a MacOS user or forced to use an alternative bash, see [Install Bashbot](doc/0_install.md) + ### Run your Bot as a restricted user **I recommend to run your bot as a user, with almost no access rights.** All files your Bot have write access to are in danger to be overwritten/deleted if your bot is hacked. @@ -183,4 +192,4 @@ This may happen if to many wrong requests are sent to api.telegram.org, e.g. usi If you feel that there's something missing or if you found a bug, feel free to submit a pull request! -#### $$VERSION$$ v0.94-5-g6531fec +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/README.txt b/README.txt index 5efe3f1..53500a3 100644 --- a/README.txt +++ b/README.txt @@ -154,6 +154,18 @@ allowed to push changes without passing all shellcheck tests. In addition bashbot has a [test suite](doc/7_develop.md) to check if important functionality is working as expected. +### Do not use #!/usr/bin/env bash + +We stay with /bin/bash shebang, because using the system bash is more save from +security perspective. + +It makes it harder for attackers and users to place alternative versions of +bash and avoids using +possibly broken, mangled or compromised bash executables. + +If you are a MacOS user or forced to use an alternative bash, see [Install +Bashbot](doc/0_install.md) + ### Run your Bot as a restricted user **I recommend to run your bot as a user, with almost no access rights.** All files your Bot have write access to are in danger to be overwritten/deleted @@ -257,4 +269,4 @@ tor proxy on your server you may uncomment the ```BASHBOT_CURL_ARGS``` line in If you feel that there's something missing or if you found a bug, feel free to submit a pull request! -#### $$VERSION$$ v0.94-5-g6531fec +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/addons/antiFlood.sh b/addons/antiFlood.sh index 0d9a21f..3ffc72e 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # used events: # diff --git a/addons/example.sh b/addons/example.sh index 3bd8cbe..e719e92 100644 --- a/addons/example.sh +++ b/addons/example.sh @@ -4,7 +4,7 @@ # Addons can register to bashbot events at statup # by providing their name and a callback per event # -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # # If an event occours each registered event function is called. # diff --git a/bashbot.rc b/bashbot.rc index e76753c..556e437 100755 --- a/bashbot.rc +++ b/bashbot.rc @@ -1,7 +1,7 @@ #!/bin/sh # description: Start or stop telegram-bash-bot # -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # shellcheck disable=SC2009 # shellcheck disable=SC2181 diff --git a/bashbot.sh b/bashbot.sh index 7d8af2c..c297399 100755 --- a/bashbot.sh +++ b/bashbot.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$$ v0.94-5-g6531fec +#### $$VERSION$$ V0.94-0-gbdb50c8 # # Exit Codes: # - 0 sucess (hopefully) diff --git a/commands.sh b/commands.sh index 61935c7..7bd5be1 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$$ v0.94-1-gf13a2d0 +#### $$VERSION$$ V0.94-0-gbdb50c8 # # 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 abd3247..b4b8eed 100755 --- a/dev/all-tests.sh +++ b/dev/all-tests.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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # 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/git-add.sh b/dev/git-add.sh index 457836c..02ffd22 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # 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/pre-commit.sh b/dev/hooks/pre-commit.sh index 0a2e6df..1bd3686 100755 --- a/dev/hooks/pre-commit.sh +++ b/dev/hooks/pre-commit.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 ############ # 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 c1dba63..afb75f6 100755 --- a/dev/hooks/pre-push.sh +++ b/dev/hooks/pre-push.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 ############ # NOTE: you MUST run install-hooks.sh again when updating this file! diff --git a/dev/install-hooks.sh b/dev/install-hooks.sh index 7fd70fc..231e0d9 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # 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 62f9c7c..8d0bc0b 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -2,7 +2,7 @@ # file: make-distribution.sh # creates files and arcchives to dirtribute bashbot # -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # 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-standalone.sh b/dev/make-standalone.sh index 27dbcbf..2152929 100755 --- a/dev/make-standalone.sh +++ b/dev/make-standalone.sh @@ -5,7 +5,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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # 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/shellcheck.files b/dev/shellcheck.files index 4d49180..daf2243 100644 --- a/dev/shellcheck.files +++ b/dev/shellcheck.files @@ -1,4 +1,4 @@ # list of additional files to check from shellcheck -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 bashbot.rc mycommands.sh.clean diff --git a/dev/version.sh b/dev/version.sh index eca2043..54a5284 100755 --- a/dev/version.sh +++ b/dev/version.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # shellcheck disable=SC2016 # # Easy Versioning in git: diff --git a/doc/0_install.md b/doc/0_install.md index b4dd56c..0693d8b 100644 --- a/doc/0_install.md +++ b/doc/0_install.md @@ -1,16 +1,5 @@ #### [Home](../README.md) -## Note for Users of MacOS - -You must install a more current version of bash, as the default bash is way to old, -see e.g. [Install Bash on Mac](http://macappstore.org/bash/) - -After installation / update of bashbot you must change the shebang line to point to your bash location -e.g. with the provided script ˋexamples/bash2env.shˋ - -We stay with /bin/bash shebang, because using the system bash is more save. It makes it harder -for attackers or users to place broken, mangled or compromised bash executables. - ## Install bashbot 1. Go to the directory you want to install bashbot, e.g. @@ -54,6 +43,16 @@ If you modified 'commands.sh' move your changes to 'mycommands.sh', this avoids Now you can restart your bashbot instances. +### Note for MacOS Users + +You must install a more current version of bash, as the default bash is way to old, +see e.g. [Install Bash on Mac](http://macappstore.org/bash/) + +After installation / update of bashbot you must change the shebang line to point to your bash location +e.g. with the provided script ˋexamples/bash2env.shˋ + +We stay with /bin/bash shebang, because using the system bash is more save, see [Security Considerations](../README.md#Security Considerations) + ### Notes on Updates #### removal of TMUX @@ -98,5 +97,5 @@ The old format is supported for backward compatibility, but may fail for corner #### [Next Create Bot](1_firstbot.md) -#### $$VERSION$$ v0.94-5-g6531fec +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/doc/1_firstbot.md b/doc/1_firstbot.md index 8a6486b..180c2a1 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/doc/2_usage.md b/doc/2_usage.md index 5589b73..a8c26c3 100644 --- a/doc/2_usage.md +++ b/doc/2_usage.md @@ -240,5 +240,5 @@ send_action "${CHAT[ID]}" "action" #### [Prev Create Bot](1_firstbot.md) #### [Next Advanced Usage](3_advanced.md) -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/doc/3_advanced.md b/doc/3_advanced.md index 21e4dc6..aebd317 100644 --- a/doc/3_advanced.md +++ b/doc/3_advanced.md @@ -180,5 +180,5 @@ See also [answer_inline_multi, answer_inline_compose](6_reference.md#answer_inli #### [Prev Getting started](2_usage.md) #### [Next Expert Use](4_expert.md) -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/doc/4_expert.md b/doc/4_expert.md index 5ba3b11..a0a0c04 100644 --- a/doc/4_expert.md +++ b/doc/4_expert.md @@ -348,5 +348,5 @@ for every poll until the maximum of BASHBOT_SLEEP ms. #### [Prev Advanced Use](3_advanced.md) #### [Next Best Practice](5_practice.md) -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/doc/5_practice.md b/doc/5_practice.md index ccce2ce..dbb4ee5 100644 --- a/doc/5_practice.md +++ b/doc/5_practice.md @@ -152,5 +152,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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/doc/6_reference.md b/doc/6_reference.md index 76dcda4..9fbacf2 100644 --- a/doc/6_reference.md +++ b/doc/6_reference.md @@ -973,5 +973,5 @@ The name of your bot is availible as bash variable "$ME", there is no need to ca #### [Prev Best Practice](5_practice.md) #### [Next Notes for Developers](7_develop.md) -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/doc/7_develop.md b/doc/7_develop.md index 96840f9..312de72 100644 --- a/doc/7_develop.md +++ b/doc/7_develop.md @@ -328,5 +328,5 @@ fi #### [Prev Function Reference](6_reference.md) -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/examples/README.md b/examples/README.md index 3af1451..363162c 100644 --- a/examples/README.md +++ b/examples/README.md @@ -55,6 +55,6 @@ convert existing bots. **external-use** will contain some examples on how to send messages from external scripts to Telegram chats or users. -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 diff --git a/examples/background-scripts/run_diskusage.sh b/examples/background-scripts/run_diskusage.sh index 0cbb92a..7eb1a7e 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/examples/background-scripts/run_filecontent.sh b/examples/background-scripts/run_filecontent.sh index d160cf4..3f2a157 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/examples/background-scripts/run_filename.sh b/examples/background-scripts/run_filename.sh index 1d4ba25..391b02a 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/examples/background-scripts/run_notify.sh b/examples/background-scripts/run_notify.sh index 348795e..9e9a3cf 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/examples/bash2env.sh b/examples/bash2env.sh index a448195..c0ee605 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) -#### $$VERSION$$ v0.94-3-g96fda44 +#### $$VERSION$$ V0.94-0-gbdb50c8 # 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 22f757b..6a09f59 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 if [ "${2}" = "" ] || [ "${2}" = "-h" ]; then echo "Usage: $0 botname command" diff --git a/examples/bashbot.cron b/examples/bashbot.cron index 4b26da4..d72147c 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 SHELL=/bin/sh diff --git a/examples/calc.sh b/examples/calc.sh index 4ffe6e8..ea08c46 100755 --- a/examples/calc.sh +++ b/examples/calc.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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/examples/notify.sh b/examples/notify.sh index da713f6..1ce76ca 100755 --- a/examples/notify.sh +++ b/examples/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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/examples/question.sh b/examples/question.sh index 98e5ef8..c220667 100755 --- a/examples/question.sh +++ b/examples/question.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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/examples/send-system-status/botacl b/examples/send-system-status/botacl index c6fa66a..8bfeaed 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # Format: # user:ressource:chat diff --git a/examples/send-system-status/mycommands.sh b/examples/send-system-status/mycommands.sh index 615e30e..4fe1fe3 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # # shellcheck disable=SC2154 # shellcheck disable=SC2034 diff --git a/modules/aliases.sh b/modules/aliases.sh index 5af7dfa..6404491 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # # source from commands.sh to use the aliases diff --git a/modules/answerInline.sh b/modules/answerInline.sh index 46e7540..7757d97 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # source from commands.sh to use the inline functions diff --git a/modules/background.sh b/modules/background.sh index 9d6d7a2..12e9d4d 100644 --- a/modules/background.sh +++ b/modules/background.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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # source from commands.sh if you want ro use interactive or background jobs diff --git a/modules/chatMember.sh b/modules/chatMember.sh index ad9559d..a308aab 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$$ v0.94-1-gf13a2d0 +#### $$VERSION$$ V0.94-0-gbdb50c8 # source once magic, function named like file eval "$(basename "${BASH_SOURCE[0]}")(){ :; }" diff --git a/modules/jsonDB.sh b/modules/jsonDB.sh index f74c02d..4cdaf64 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # # source from commands.sh to use jsonDB functions # diff --git a/modules/sendMessage.sh b/modules/sendMessage.sh index de67a72..1df7f87 100644 --- a/modules/sendMessage.sh +++ b/modules/sendMessage.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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # source once magic, function named like file eval "$(basename "${BASH_SOURCE[0]}")(){ :; }" diff --git a/mycommands.sh b/mycommands.sh index 5c486ce..94992a7 100644 --- a/mycommands.sh +++ b/mycommands.sh @@ -8,7 +8,7 @@ # #### if you start to develop your own bot, use the clean version of this file: # #### mycommands.clean # -#### $$VERSION$$ v0.94-2-g93f4966 +#### $$VERSION$$ V0.94-0-gbdb50c8 # # uncomment the following lines to overwrite info and help messages diff --git a/mycommands.sh.clean b/mycommands.sh.clean index 8def1bb..66b031f 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$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # ########## diff --git a/test/ADD-test-new.sh b/test/ADD-test-new.sh index 054a990..cc32650 100755 --- a/test/ADD-test-new.sh +++ b/test/ADD-test-new.sh @@ -2,7 +2,7 @@ # # ADD a new test skeleton to test dir, but does not activate test # -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # 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/test/ALL-tests.inc.sh b/test/ALL-tests.inc.sh index c3480d8..038e856 100644 --- a/test/ALL-tests.inc.sh +++ b/test/ALL-tests.inc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # common variables export TESTME DIRME TESTDIR LOGFILE REFDIR TESTNAME diff --git a/test/a-commit-test.sh b/test/a-commit-test.sh index 0c9304c..deab289 100755 --- a/test/a-commit-test.sh +++ b/test/a-commit-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 ../dev/hooks/pre-commit.sh diff --git a/test/b-example-test.sh b/test/b-example-test.sh index 7db05ba..5e9ac32 100644 --- a/test/b-example-test.sh +++ b/test/b-example-test.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # file: b-example-test.sh -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh diff --git a/test/c-init-test.sh b/test/c-init-test.sh index 1e43821..de076a5 100755 --- a/test/c-init-test.sh +++ b/test/c-init-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh diff --git a/test/d-JSON.sh-test.sh b/test/d-JSON.sh-test.sh index 55e14bd..a1c99ec 100755 --- a/test/d-JSON.sh-test.sh +++ b/test/d-JSON.sh-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # 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 babcca2..7faf598 100755 --- a/test/d-process_inline-test.sh +++ b/test/d-process_inline-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh diff --git a/test/d-process_message-test.sh b/test/d-process_message-test.sh index dda0fe0..1e9c9c9 100755 --- a/test/d-process_message-test.sh +++ b/test/d-process_message-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh diff --git a/test/d-send_message-test.sh b/test/d-send_message-test.sh index d7d1843..74895a3 100755 --- a/test/d-send_message-test.sh +++ b/test/d-send_message-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh diff --git a/test/d-user_is-test.sh b/test/d-user_is-test.sh index bb109d4..af6da46 100755 --- a/test/d-user_is-test.sh +++ b/test/d-user_is-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh diff --git a/test/e-env-test.sh b/test/e-env-test.sh index 56dacf8..f2041d5 100755 --- a/test/e-env-test.sh +++ b/test/e-env-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v0.94-0-gaaa71c8 +#### $$VERSION$$ V0.94-0-gbdb50c8 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh