Merge branch 'master' into develop

This commit is contained in:
Kay Marquardt 2019-04-09 13:06:18 +02:00 committed by GitHub
commit 261505b570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions

View File

@ -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.50-12-g9fd2f5c
#### $$VERSION$$ v0.50-13-g4d5d386

View File

@ -147,6 +147,6 @@ Allowed values: typing for text messages, upload_photo for photos, record_video
send_action "${CHAT[ID]}" "action"
```
#### $$VERSION$$ v0.50-12-g9fd2f5c
#### $$VERSION$$ v0.50-13-g4d5d386

View File

@ -97,5 +97,5 @@ To send stickers through an *inline query*:
answer_inline_query "$iQUERY_ID" "cached_sticker" "identifier for the sticker"
```
#### $$VERSION$$ v0.50-12-g9fd2f5c
#### $$VERSION$$ v0.50-13-g4d5d386

View File

@ -101,5 +101,6 @@ An example crontab is provided in ```bashbot.cron```.
- If you are running bashbot with your user-ID, copy the examples lines to your crontab and remove username ```nobody```.
- 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.50-12-g9fd2f5c
#### $$VERSION$$ v0.50-13-g4d5d386

View File

@ -1,6 +1,7 @@
#!/bin/bash
#
#### $$VERSION$$ v0.6-dev-3-g614eae8
#### $$VERSION$$ v0.50-13-g4d5d386
# shellcheck disable=SC2016
#
# Easy Versioning in git:
@ -40,7 +41,7 @@ unset IFS
VERSION="$(git describe --tags --long)"
echo "Update files to version $VERSION ..."
for file in *
for file in * doc/*
do
[ ! -f "$file" ] && continue
#[ "$file" == "version" ] && continue