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

fix never working file download

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2021-02-06 16:05:18 +01:00
parent 0702d58ab0
commit 5212df422e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bashbot.sh
View File

@ -30,7 +30,7 @@ BOTCOMMANDS="-h help init start stop status suspendback resumeback killb
# 8 - curl/wget missing # 8 - curl/wget missing
# 10 - not bash! # 10 - not bash!
# #
#### $$VERSION$$ v1.41-dev-5-g54673ac #### $$VERSION$$ v1.41-dev-6-g0702d58
################################################################## ##################################################################
# are we running in a terminal? # are we running in a terminal?
@ -346,6 +346,7 @@ fi
BASHBOT_RETRY="" # retry by default BASHBOT_RETRY="" # retry by default
URL="${BASHBOT_URL:-https://api.telegram.org/bot}${BOTTOKEN}" URL="${BASHBOT_URL:-https://api.telegram.org/bot}${BOTTOKEN}"
FILEURL="${URL%%/bot*}/file/bot${BOTTOKEN}"
ME_URL=${URL}'/getMe' ME_URL=${URL}'/getMe'
################# #################
@ -450,7 +451,7 @@ download_file() {
fi fi
else else
# prefix https://api.telegram... # prefix https://api.telegram...
url="${URL}/${url}" url="${FILEURL}/${url}"
fi fi
# filename: replace "/" with "-", use mktemp if exist # filename: replace "/" with "-", use mktemp if exist
file="${DATADIR:-.}/${file//\//-}" file="${DATADIR:-.}/${file//\//-}"

4
doc/6_reference.md
View File

@ -1444,8 +1444,8 @@ avatar.jpg jhsdf-avatar.jpg download-askjgftGJGdh1Z
####### #######
# manually download files to current directory (not recommended) # manually download files to current directory (not recommended)
getJson "${URL}/${photo}" >"downloaded_photo.jpg"
getJson "https://avatars.githubusercontent.com/u/13046303" >"avatar.jpg" getJson "https://avatars.githubusercontent.com/u/13046303" >"avatar.jpg"
getJson "i${URL}/${photo}" >"downloaded_photo.jpg"
ls -F ls -F
JSON.sh/ bin/ modules/ data-bot-bash/ JSON.sh/ bin/ modules/ data-bot-bash/
@ -1617,5 +1617,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.41-dev-5-g54673ac #### $$VERSION$$ v1.41-dev-6-g0702d58