From 87ec24bcebf7c25b13f1243418fa82eaf349d6a3 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Sun, 14 Apr 2019 23:05:43 +0200 Subject: [PATCH] Version 0.60-rc1 --- README.md | 2 +- README.txt | 7 ++++--- bashbot.cron | 2 +- bashbot.rc | 2 +- bashbot.sh | 2 +- calc | 2 +- commands.sh | 2 +- doc/1_firstbot.md | 2 +- doc/2_usage.md | 2 +- doc/3_advanced.md | 2 +- doc/4_expert.md | 7 ++++--- doc/5_practice.md | 2 +- notify | 2 +- question | 2 +- version | 2 +- 15 files changed, 21 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 268135e..f22a7c8 100644 --- a/README.md +++ b/README.md @@ -77,4 +77,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.60-dev3-1-gc944292 +#### $$VERSION$$ v0.6-rc1-0-gc001d14 diff --git a/README.txt b/README.txt index fba9ed9..244455f 100644 --- a/README.txt +++ b/README.txt @@ -6,7 +6,8 @@ A Telegram bot written in bash. Depends on http://github.com/tmux/tmux[tmux]. Uses http://github.com/dominictarr/JSON.sh[JSON.sh]. -For full UTF-8 support you need python on your system (optional). +For full UTF-8 support you need +link:doc/4_expert.md#UTF-8-Support[python on your system] (optional). Written by Drew (@topkecleon), Daniil Gentili (@danogentili), and Kay M (@gnadelwartz). @@ -121,5 +122,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.60-dev3-0-g2550aec -+++++++++++++++++++++++++++++++++++++++++++++ +latexmath:[\[VERSION\]] v0.6-rc1-0-gc001d14 ++++++++++++++++++++++++++++++++++++++++++++ diff --git a/bashbot.cron b/bashbot.cron index 770c393..d9c74cc 100644 --- a/bashbot.cron +++ b/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.60-dev3-8-gdec3150 +#### $$VERSION$$ v0.6-rc1-0-gc001d14 SHELL=/bin/sh diff --git a/bashbot.rc b/bashbot.rc index 8625dba..3c6804e 100755 --- a/bashbot.rc +++ b/bashbot.rc @@ -1,7 +1,7 @@ #!/bin/sh # description: Start or stop telegram-bash-bot # -#### $$VERSION$$ v0.60-dev3-8-gdec3150 +#### $$VERSION$$ v0.6-rc1-0-gc001d14 # shellcheck disable=SC2009 # shellcheck disable=SC2181 diff --git a/bashbot.sh b/bashbot.sh index 42f13aa..00b14d2 100755 --- a/bashbot.sh +++ b/bashbot.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$$ v0.60-dev3-9-g7e75b92 +#### $$VERSION$$ v0.6-rc1-0-gc001d14 # # Exit Codes: # - 0 sucess (hopefully) diff --git a/calc b/calc index f5f9260..a79c376 100755 --- a/calc +++ b/calc @@ -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.60-dev3-8-gdec3150 +#### $$VERSION$$ v0.6-rc1-0-gc001d14 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/commands.sh b/commands.sh index ba8b78b..d698859 100755 --- a/commands.sh +++ b/commands.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.60-dev3-0-g2550aec +#### $$VERSION$$ v0.6-rc1-0-gc001d14 # # shellcheck disable=SC2154 # shellcheck disable=SC2034 diff --git a/doc/1_firstbot.md b/doc/1_firstbot.md index 684cecb..6fb9479 100644 --- a/doc/1_firstbot.md +++ b/doc/1_firstbot.md @@ -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.60-dev3-7-gf5538ef +#### $$VERSION$$ v0.6-rc1-0-gc001d14 diff --git a/doc/2_usage.md b/doc/2_usage.md index 13ab651..d00e7af 100644 --- a/doc/2_usage.md +++ b/doc/2_usage.md @@ -147,6 +147,6 @@ Allowed values: typing for text messages, upload_photo for photos, record_video send_action "${CHAT[ID]}" "action" ``` -#### $$VERSION$$ v0.60-dev3-7-gf5538ef +#### $$VERSION$$ v0.6-rc1-0-gc001d14 diff --git a/doc/3_advanced.md b/doc/3_advanced.md index 93bd97c..1ce1014 100644 --- a/doc/3_advanced.md +++ b/doc/3_advanced.md @@ -153,5 +153,5 @@ To send stickers through an *inline query*: answer_inline_query "$iQUERY_ID" "cached_sticker" "identifier for the sticker" ``` -#### $$VERSION$$ v0.60-dev3-7-gf5538ef +#### $$VERSION$$ v0.6-rc1-0-gc001d14 diff --git a/doc/4_expert.md b/doc/4_expert.md index a397f11..ea263a5 100644 --- a/doc/4_expert.md +++ b/doc/4_expert.md @@ -41,9 +41,10 @@ Telegram send JSON messages with all characters not fitting in one byte (<256 bi one byte ASCII. Multibyte UTF-8 characters, e.g. Emoticons and Arabic characters, are send in UTF-16 notation. The Emoticons ``` 😁 😘 ❤️ 😊 👍 ``` are encoded as: ``` \uD83D\uDE01 \uD83D\uDE18 \u2764\uFE0F \uD83D\uDE0A \uD83D\uDC4D ``` -**This mixed JSON encoding can not decoded from ```echo -e``` or ```printf '%s\\n'```**, this works only for single byte characters! +**This mixed JSON encoding can not decoded from** ```echo -e``` or ```printf '%s\\n'```, this works only for single byte characters! -To to fully support decoding of multibyte characters you need a working python2 instllation on your system. If no python is detected bashbot falls back to a **slow, pure bash solution which may not always work 100% correct**. +To to fully support decoding of multibyte characters you need a working python2 installation on your system. +If no python is detected bashbot falls back to a **slow, pure bash solution which may not work for some corner cases**. ### Run as other user or system service @@ -101,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.60-dev3-7-gf5538ef +#### $$VERSION$$ v0.6-rc1-0-gc001d14 diff --git a/doc/5_practice.md b/doc/5_practice.md index 89bd3c4..49b57f3 100644 --- a/doc/5_practice.md +++ b/doc/5_practice.md @@ -111,5 +111,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.60-dev3-9-g7e75b92 +#### $$VERSION$$ v0.6-rc1-0-gc001d14 diff --git a/notify b/notify index 16472d8..bb1daff 100755 --- a/notify +++ b/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.60-dev3-0-g2550aec +#### $$VERSION$$ v0.6-rc1-0-gc001d14 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/question b/question index a886f0c..036490e 100755 --- a/question +++ b/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.60-dev3-0-g2550aec +#### $$VERSION$$ v0.6-rc1-0-gc001d14 # adjust your language setting here # https://github.com/topkecleon/telegram-bot-bash#setting-up-your-environment diff --git a/version b/version index 57fbae3..da01d03 100755 --- a/version +++ b/version @@ -1,6 +1,6 @@ #!/bin/bash # -#### $$VERSION$$ v0.60-dev3-0-g2550aec +#### $$VERSION$$ v0.6-rc1-0-gc001d14 # shellcheck disable=SC2016 # # Easy Versioning in git: