octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2024-11-21 23:25:08 +00:00
Code Issues Projects Releases Wiki Activity

some minor text changes

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2020-12-27 21:17:39 +01:00
parent 8c9298d548
commit 249dbb0471
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bashbot.sh
View File

@ -26,7 +26,7 @@
# 8 - curl/wget missing
# 10 - not bash!
#
#### $$VERSION$$ v1.21-dev-15-ga1f7215
#### $$VERSION$$ v1.21-dev-17-g8c9298d
##################################################################
# shellcheck disable=SC2140,SC2031,SC2120,SC1091,SC1117,SC2059
@ -222,16 +222,15 @@ if [[ -z "${BOTTOKEN}" && ! -f "${BOTCONFIG}.jssh" ]]; then
printf "Running headless, set botadmin to AUTO MODE!\n"
else
printf "${RED}ENTER BOT ADMIN...${NN}"
printf "${ORANGE}PLEASE WRITE YOUR TELEGRAM ID HERE OR PRESS ENTER\nTO MAKE FIRST USER TYPING '/start' BOT ADMIN${NN}"
printf "${ORANGE}PLEASE WRITE YOUR TELEGRAM ID HERE OR PRESS ENTER\nTO MAKE FIRST USER TYPING '/start' BOT ADMIN${NN}?\b"
read -r admin
printf "\n"
fi
[ -z "${admin}" ] && admin='?'
printf '["botadmin"]\t"%s"\n' "${admin}" >> "${BOTCONFIG}.jssh"
fi
# setup botacl file
if [ ! -f "${BOTACL}" ]; then
printf "${ORANGE}Create empty ${BOTACL} file.${NC}"
printf "${GREY}Create initial ${BOTACL} file.${NN}"
printf '\n' >"${BOTACL}"
fi
# setup data dir file
@ -285,7 +284,7 @@ fi
# BOTTOKEN format checks
if ! check_token "${BOTTOKEN}"; then
printf "${ORANGE}Warning: Your bot token is incorrect, it should have the following format:${NC}\n"
printf "\n${ORANGE}Warning: Your bot token is incorrect, it should have the following format:${NC}\n"
printf "<your_bot_id>${RED}:${NC}<35_alphanumeric_characters-hash> ${RED}e.g. =>${NC} 123456789${RED}:${NC}Aa-Zz_0Aa-Zz_1Aa-Zz_2Aa-Zz_3Aa-Zz_4\n\n"
printf "${GREY}Your bot token: '${NC}${BOTTOKEN//:/${RED}:${NC}}'\n"

4
doc/6_reference.md
View File

@ -114,7 +114,7 @@ The main use case for send_message is to process the output of interactive chats
##### send_file
send_file allows can send different type's of files, e.g. photos, stickers, audio, media, etc.
send_file can send different type's of files, e.g. photos, stickers, audio, media, etc.
[see Telegram API documentation](https://core.telegram.org/bots/api#sending-files).
It's recommended to use __absolute path names__ (_starting with `/`_), as relative path names are threated as __relative to UPLOADDIR__ `data-bot-bash/upload`!
@ -1155,5 +1155,5 @@ The name of your bot is available as bash variable "$ME", there is no need to ca
#### [Prev Best Practice](5_practice.md)
#### [Next Notes for Developers](7_develop.md)
#### $$VERSION$$ v1.21-dev-3-g79402ec
#### $$VERSION$$ v1.21-dev-17-g8c9298d

7
doc/7_develop.md
View File

@ -197,7 +197,10 @@ Now have a look at the directory 'standalone', here you find the files 'bashbot.
5. give your (dev) fork a new version tag: `git tag v1.xx`
6. setup github hooks by running `dev/install-hooks.sh`
Note for Debian: Debian Buster has an old shellcheck version, pls update from [buster-backports](https://backports.debian.org/Instructions/)
Note for Debian: Debian Buster ships older versions of many utilities, pls try to install from [buster-backports](https://backports.debian.org/Instructions/)
```bash
sudo apt-get -t buster-backports install git shellcheck pandoc codespell curl
```
#### Test, Add, Push changes
A typical bashbot develop loop looks as follow:
@ -351,5 +354,5 @@ fi
#### [Prev Function Reference](6_reference.md)
#### $$VERSION$$ v1.20-3-g232a16b
#### $$VERSION$$ v1.21-dev-17-g8c9298d