mirror of
https://github.com/octoleo/telegram-bot-bash.git
synced 2024-05-29 08:20:52 +00:00
Bashbot Version 1.21 (cleanup release)
This commit is contained in:
parent
c85af776ba
commit
11daa4890d
|
@ -390,6 +390,6 @@ It features background tasks and interactive chats, and can serve as an interfac
|
||||||
<p>@Gnadelwartz</p>
|
<p>@Gnadelwartz</p>
|
||||||
<h2>That's it all guys!</h2>
|
<h2>That's it all guys!</h2>
|
||||||
<p>If you feel that there's something missing or if you found a bug, feel free to submit a pull request!</p>
|
<p>If you feel that there's something missing or if you found a bug, feel free to submit a pull request!</p>
|
||||||
<h4>$$VERSION$$ v1.21-pre-28-g5415f28</h4>
|
<h4>$$VERSION$$ v1.21-0-gc85af77</h4>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -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!
|
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
|
||||||
|
|
|
@ -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
|
If you feel that there's something missing or if you found a bug, feel free to
|
||||||
submit a pull request!
|
submit a pull request!
|
||||||
|
|
||||||
#### $$VERSION$$ v1.21-pre-28-g5415f28
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# this addon counts how many files, e.g. stickers, are sent to
|
# this addon counts how many files, e.g. stickers, are sent to
|
||||||
# a chat and takes actions if threshold is reached
|
# a chat and takes actions if threshold is reached
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-dev-44-gb04ee84
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
# used events:
|
# used events:
|
||||||
#
|
#
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# Addons can register to bashbot events at startup
|
# Addons can register to bashbot events at startup
|
||||||
# by providing their name and a callback per event
|
# 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.
|
# If an event occurs each registered event function is called.
|
||||||
#
|
#
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#
|
#
|
||||||
# tested on: ubuntu, opensuse, debian
|
# tested on: ubuntu, opensuse, debian
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-39-ge8aa80c
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
# shellcheck disable=SC2009
|
# shellcheck disable=SC2009
|
||||||
# shellcheck disable=SC2181
|
# shellcheck disable=SC2181
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
# 8 - curl/wget missing
|
# 8 - curl/wget missing
|
||||||
# 10 - not bash!
|
# 10 - not bash!
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-28-g5415f28
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
##################################################################
|
##################################################################
|
||||||
|
|
||||||
# emmbeded system may claim bash but it is not
|
# 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
|
# 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}"
|
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
|
fi
|
||||||
|
|
||||||
|
@ -1289,14 +1289,14 @@ if [ -z "${SOURCE}" ]; then
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
printf "${RED}${REALME##*/}: unknown command${NN}"
|
printf "${RED}${REALME##*/}: unknown command${NN}"
|
||||||
printf "${RED}Available commands: ${GREY}${BOTCOMMANDS}${NN}" && exit
|
printf "${ORANGE}Available commands: ${GREY}${BOTCOMMANDS}${NN}" && exit
|
||||||
exit 4
|
exit 4
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# warn if root
|
# warn if root
|
||||||
if [[ "${UID}" -eq "0" ]] ; then
|
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}"
|
printf "${ORANGE}You are at HIGH RISK when running a Telegram BOT with root privileges!${NN}"
|
||||||
fi
|
fi
|
||||||
fi # end source
|
fi # end source
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 18.12.2020 12:27
|
# CREATED: 18.12.2020 12:27
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-43-gbbdeb8b
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
############
|
############
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 23.12.2020 20:34
|
# CREATED: 23.12.2020 20:34
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.20-0-g2ab00a2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 16.12.2020 16:14
|
# CREATED: 16.12.2020 16:14
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.20-3-g232a16b
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
# shellcheck disable=SC2059
|
# shellcheck disable=SC2059
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 23.12.2020 16:52
|
# CREATED: 23.12.2020 16:52
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-dev-0-g2e878fd
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 25.12.2020 20:24
|
# CREATED: 25.12.2020 20:24
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-dev-0-g2e878fd
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
# CREATED: 16.12.2020 11:34
|
# CREATED: 16.12.2020 11:34
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-dev-0-g2e878fd
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
####
|
####
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# 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.
|
# adjust your language setting here, e.g. when run from other user or cron.
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#
|
#
|
||||||
# Description: run all tests, exit after failed test
|
# 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,
|
# magic to ensure that we're always inside the root of our application,
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# works together with git pre-push.sh and ADD all changed files since last push
|
# 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,
|
# magic to ensure that we're always inside the root of our application,
|
||||||
# no matter from which directory we'll run script
|
# no matter from which directory we'll run script
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env bash
|
#!/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!
|
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env bash
|
#!/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!
|
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env bash
|
#!/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!
|
# NOTE: you MUST run install-hooks.sh again when updating this file!
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
# Usage: source inject-json.sh
|
# Usage: source inject-json.sh
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-dev-22-ga3efcd2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
##############################################################
|
##############################################################
|
||||||
|
|
||||||
# download JSON.sh
|
# download JSON.sh
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# this has to run once atfer git clone
|
# this has to run once atfer git clone
|
||||||
# and every time we create new hooks
|
# 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,
|
# magic to ensure that we're always inside the root of our application,
|
||||||
# no matter from which directory we'll run script
|
# no matter from which directory we'll run script
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
# Options: --notest - skip tests
|
# 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,
|
# magic to ensure that we're always inside the root of our application,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
# Usage: source make-hmtl
|
# Usage: source make-hmtl
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-3-gbbbf57c
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
##############################################################
|
##############################################################
|
||||||
|
|
||||||
# check for correct dir
|
# check for correct dir
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
# If you your bot is finished you can use make-standalone.sh to create the
|
# 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!
|
# 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,
|
# magic to ensure that we're always inside the root of our application,
|
||||||
|
@ -84,9 +84,11 @@ chmod +x bashbot.sh
|
||||||
rm -rf modules
|
rm -rf modules
|
||||||
|
|
||||||
printf "Create minimized Version of bashbot.sh and commands.sh\n"
|
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 '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
|
sed 'N;s/\\\n/ /;P;D' > commands.sh.min
|
||||||
chmod +x bashbot.sh.min
|
chmod +x bashbot.sh.min
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#
|
#
|
||||||
# joke hack to obfuscate bashbot.min.sh
|
# joke hack to obfuscate bashbot.min.sh
|
||||||
#
|
#
|
||||||
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
# shellcheck disable=SC2028,SC2016,SC1117
|
# shellcheck disable=SC2028,SC2016,SC1117
|
||||||
|
|
||||||
infile="bashbot.sh"
|
infile="bashbot.sh"
|
||||||
|
@ -15,7 +16,7 @@ fi
|
||||||
{
|
{
|
||||||
# shellcheck disable=SC2183
|
# shellcheck disable=SC2183
|
||||||
printf '#!/bin/bash\na="$PWD";cd "$(mktemp -d)"||exit;%s'\
|
printf '#!/bin/bash\na="$PWD";cd "$(mktemp -d)"||exit;%s'\
|
||||||
'printf '"'$(gzip -9 <bashbot.sh | base64)'"'|base64 -d|gunzip >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}"
|
} >"${outfile}"
|
||||||
|
|
||||||
chmod +x "${outfile}"
|
chmod +x "${outfile}"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# list of additional files to check from shellcheck
|
# list of additional files to check from shellcheck
|
||||||
#### $$VERSION$$ v1.20-0-g2ab00a2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
bashbot.rc
|
bashbot.rc
|
||||||
mycommands.sh.clean
|
mycommands.sh.clean
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-3-gbbbf57c
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
#
|
#
|
||||||
# Easy Versioning in git:
|
# Easy Versioning in git:
|
||||||
|
|
|
@ -131,5 +131,5 @@ You must update to [Version 1.20](https://github.com/topkecleon/telegram-bot-bas
|
||||||
|
|
||||||
#### [Next Create Bot](1_firstbot.md)
|
#### [Next Create Bot](1_firstbot.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.21-dev-41-g41378f8
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
|
@ -65,5 +65,5 @@ group. This step is up to you actually.
|
||||||
#### [Prev Installation](0_install.md)
|
#### [Prev Installation](0_install.md)
|
||||||
#### [Next Getting started](2_usage.md)
|
#### [Next Getting started](2_usage.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.20-0-g2ab00a2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
|
@ -341,5 +341,5 @@ send_action "${CHAT[ID]}" "action"
|
||||||
#### [Prev Create Bot](1_firstbot.md)
|
#### [Prev Create Bot](1_firstbot.md)
|
||||||
#### [Next Advanced Usage](3_advanced.md)
|
#### [Next Advanced Usage](3_advanced.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.21-dev-28-g43f5536
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
|
@ -301,5 +301,5 @@ Note: If you disable automatic retry, se above, you disable also connection prob
|
||||||
#### [Prev Getting started](2_usage.md)
|
#### [Prev Getting started](2_usage.md)
|
||||||
#### [Next Expert Use](4_expert.md)
|
#### [Next Expert Use](4_expert.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.21-dev-29-g13d15f4
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
|
@ -378,5 +378,5 @@ for every poll until the maximum of BASHBOT_SLEEP ms.
|
||||||
#### [Prev Advanced Use](3_advanced.md)
|
#### [Prev Advanced Use](3_advanced.md)
|
||||||
#### [Next Best Practice](5_practice.md)
|
#### [Next Best Practice](5_practice.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.21-pre-28-g5415f28
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
|
@ -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)
|
#### [Prev Best Practice](5_practice.md)
|
||||||
#### [Next Functions Reference](6_reference.md)
|
#### [Next Functions Reference](6_reference.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.21-dev-29-g13d15f4
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
|
@ -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
|
#### File naming and locking
|
||||||
|
|
||||||
A jssh fileDB consists of two files and must reside inside `BASHBOT_ETC` or `BASHBOT_DATA`.
|
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)
|
#### [Prev Best Practice](5_practice.md)
|
||||||
#### [Next Notes for Developers](7_develop.md)
|
#### [Next Notes for Developers](7_develop.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.21-pre-44-ge0597ad
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
|
@ -358,5 +358,5 @@ fi
|
||||||
|
|
||||||
#### [Prev Function Reference](6_reference.md)
|
#### [Prev Function Reference](6_reference.md)
|
||||||
|
|
||||||
#### $$VERSION$$ v1.21-pre-28-g5415f28
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
|
@ -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
|
**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.
|
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
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#
|
#
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#### $$VERSION$$ v1.21-pre-13-g9cca55b
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# file: run_filename
|
# file: run_filename
|
||||||
# background job to display content of all new files in WATCHDIR
|
# background job to display content of all new files in WATCHDIR
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.20-0-g2ab00a2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# file: run_filename
|
# file: run_filename
|
||||||
# background job to display all new files in WATCHDIR
|
# background job to display all new files in WATCHDIR
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.20-0-g2ab00a2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#
|
#
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#### $$VERSION$$ v1.20-0-g2ab00a2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
# shellcheck disable=SC1117
|
# shellcheck disable=SC1117
|
||||||
#### $$VERSION$$ v1.21-pre-28-g5415f28
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
# adjust your language setting here
|
# adjust your language setting here
|
||||||
# https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment
|
# https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# file. multibot.sh
|
# file. multibot.sh
|
||||||
# description: run multiple telegram bots from one installation
|
# description: run multiple telegram bots from one installation
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-28-g5415f28
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
if [ "${2}" = "" ] || [ "${2}" = "-h" ]; then
|
if [ "${2}" = "" ] || [ "${2}" = "-h" ]; then
|
||||||
echo "Usage: $0 botname command"
|
echo "Usage: $0 botname command"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-14-ga93dc56
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
|
|
||||||
SHELL=/bin/sh
|
SHELL=/bin/sh
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-14-ga93dc56
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
######
|
######
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# AUTHOR: KayM (), kay@rrr.de
|
# AUTHOR: KayM (), kay@rrr.de
|
||||||
# DATE: 19.12.2020 19:03
|
# DATE: 19.12.2020 19:03
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.20-0-g2ab00a2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
# shellcheck disable=SC2154
|
# shellcheck disable=SC2154
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-14-ga93dc56
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
######
|
######
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-14-ga93dc56
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
######
|
######
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# file: botacl
|
# file: botacl
|
||||||
# a user not listed here, will return false from 'user_is_allowed'
|
# a user not listed here, will return false from 'user_is_allowed'
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.20-0-g2ab00a2
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
# Format:
|
# Format:
|
||||||
# user:resource:chat
|
# user:resource:chat
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# to show how you can customize bashbot by only editing mycommands.sh
|
# to show how you can customize bashbot by only editing mycommands.sh
|
||||||
# NOTE: this is not tested, simply copied from original source and reworked!
|
# 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=SC2154
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# 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
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# 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
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
# shellcheck disable=SC1117,SC2059
|
# shellcheck disable=SC1117,SC2059
|
||||||
#### $$VERSION$$ v1.21-dev-1-g03bdecb
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
# will be automatically sourced from bashbot
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# 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
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# 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
|
# source from commands.sh to use jsonDB functions
|
||||||
#
|
#
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
# shellcheck disable=SC1117
|
# shellcheck disable=SC1117
|
||||||
#### $$VERSION$$ v1.21-dev-29-g13d15f4
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
# will be automatically sourced from bashbot
|
# will be automatically sourced from bashbot
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
# #### mycommands.clean
|
# #### mycommands.clean
|
||||||
#
|
#
|
||||||
# shellcheck disable=SC1117
|
# shellcheck disable=SC1117
|
||||||
#### $$VERSION$$ v1.21-pre-40-gf95e214
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#
|
#
|
||||||
|
|
||||||
# uncomment the following lines to overwrite info and help messages
|
# uncomment the following lines to overwrite info and help messages
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# files: mycommands.sh.clean
|
# files: mycommands.sh.clean
|
||||||
# copy to mycommands.sh and add all your commands and functions here ...
|
# copy to mycommands.sh and add all your commands and functions here ...
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-40-gf95e214
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#
|
#
|
||||||
|
|
||||||
##########
|
##########
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# This file is public domain in the USA and all free countries.
|
# This file is public domain in the USA and all free countries.
|
||||||
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-42-g64400cd
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
######
|
######
|
||||||
# parameters
|
# parameters
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# 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,
|
# magic to ensure that we're always inside the root of our application,
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-33-g16e2077
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# common variables
|
# common variables
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-35-g32b99dc
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
../dev/hooks/pre-commit.sh
|
../dev/hooks/pre-commit.sh
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-35-g32b99dc
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-36-g0dfbf7b
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#### $$VERSION$$ v1.21-pre-41-g9acb2cd
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
# shellcheck source=test/ALL-tests.inc.sh
|
# shellcheck source=test/ALL-tests.inc.sh
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-36-g0dfbf7b
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-37-g7e1c1b5
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-37-g7e1c1b5
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-38-gf7b5c19
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
# LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/
|
||||||
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
# AUTHOR: KayM (gnadelwartz), kay@rrr.de
|
||||||
#
|
#
|
||||||
#### $$VERSION$$ v1.21-pre-38-gf7b5c19
|
#### $$VERSION$$ v1.21-0-gc85af77
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
# include common functions and definitions
|
# include common functions and definitions
|
||||||
|
|
Loading…
Reference in New Issue
Block a user