sync with master v0.51 and start 0.60dev2
This commit is contained in:
Kay Marquardt (Gnadelwartz)
parent
649fe44b46
commit
f4e277ba15
|
|
@ -73,4 +73,4 @@ No - its not less (in)secure as any other Bot written in any other language. But
|
|||
|
||||
If you feel that there's something missing or if you found a bug, feel free to submit a pull request!
|
||||
|
||||
#### $$VERSION$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
|
|
|||
|
|
@ -111,5 +111,5 @@ That's it!
|
|||
If you feel that there's something missing or if you found a bug, feel
|
||||
free to submit a pull request!
|
||||
|
||||
latexmath:[\[VERSION\]] v0.51-0-g0356270
|
||||
++++++++++++++++++++++++++++++++++++++++
|
||||
latexmath:[\[VERSION\]] v0.6-dev2-8-g649fe44
|
||||
++++++++++++++++++++++++++++++++++++++++++++
|
||||
|
|
|
|||
|
|
@ -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.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
||||
|
||||
SHELL=/bin/sh
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
# description: Start or stop telegram-bash-bot
|
||||
#
|
||||
#### $$VERSION$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
# shellcheck disable=SC2009
|
||||
# shellcheck disable=SC2181
|
||||
|
||||
|
|
|
|||
|
|
@ -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$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
#
|
||||
# Exit Codes:
|
||||
# - 0 sucess (hopefully)
|
||||
|
|
|
|||
|
|
@ -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.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
#
|
||||
# shellcheck disable=SC2154
|
||||
# shellcheck disable=SC2034
|
||||
|
|
|
|||
|
|
@ -70,5 +70,5 @@ git clone --recursive https://github.com/topkecleon/telegram-bot-bash
|
|||
```
|
||||
3. Change to directory ```telegram-bot.bash```, run ```./bashbot.sh init``` and follow the instructions. At this stage you are asked for your Bots token given by botfather.
|
||||
|
||||
#### $$VERSION$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
||||
|
|
|
|||
|
|
@ -147,6 +147,6 @@ Allowed values: typing for text messages, upload_photo for photos, record_video
|
|||
send_action "${CHAT[ID]}" "action"
|
||||
```
|
||||
|
||||
#### $$VERSION$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -97,5 +97,5 @@ To send stickers through an *inline query*:
|
|||
answer_inline_query "$iQUERY_ID" "cached_sticker" "identifier for the sticker"
|
||||
```
|
||||
|
||||
#### $$VERSION$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
||||
|
|
|
|||
|
|
@ -102,5 +102,5 @@ An example crontab is provided in ```bashbot.cron```.
|
|||
- if you run bashbot as an other user or a system service edit ```bashbot.cron``` to fit your needs and replace username```nobody``` with the username you want to run bashbot. copy the modified file to ```/etc/cron.d/bashbot```
|
||||
|
||||
|
||||
#### $$VERSION$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
||||
|
|
|
|||
|
|
@ -114,5 +114,5 @@ In bashbot.sh line 490:
|
|||
```
|
||||
As you can see there are only two warnings in bashbots scripts. The first is a hint you may use shell substitions instead of sed, but this is only possible for simple cases. The second warning is about an unused variable, this is true because in our examples CONTACT is not used but assigned in case you want to use it :-)
|
||||
|
||||
#### $$VERSION$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
||||
|
|
|
|||
2
notify
2
notify
|
|
@ -2,7 +2,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.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
||||
# adjust your language setting here
|
||||
# https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment
|
||||
|
|
|
|||
2
question
2
question
|
|
@ -3,7 +3,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.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
|
||||
# adjust your language setting here
|
||||
# https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment
|
||||
|
|
|
|||
4
version
4
version
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
#### $$VERSION$$ v0.51-0-g0356270
|
||||
#### $$VERSION$$ v0.6-dev2-8-g649fe44
|
||||
# shellcheck disable=SC2016
|
||||
#
|
||||
# Easy Versioning in git:
|
||||
|
|
@ -47,5 +47,7 @@ do
|
|||
echo -n " $file"
|
||||
sed -i 's/^#### $$VERSION$$.*/#### \$\$VERSION\$\$ '"$VERSION"'/' "$file"
|
||||
done
|
||||
# try to compile README.txt
|
||||
pandoc -f markdown -t asciidoc README.md | sed '/^\[\[/d' >README.txt
|
||||
echo " done."
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue