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

modules: sendMessage: fix curl detection

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2021-01-14 18:31:39 +01:00
parent 87f618fadb
commit 71daed3487
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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.30-dev-4-gf573d63 #### $$VERSION$$ v1.30-dev-6-g87f618f
################################################################## ##################################################################
# emmbeded system may claim bash but it is not # emmbeded system may claim bash but it is not

11
modules/sendMessage.sh
View File

@ -6,7 +6,7 @@
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
# #
# shellcheck disable=SC1117 # shellcheck disable=SC1117
#### $$VERSION$$ v1.30-dev-5-gdaeffb3 #### $$VERSION$$ v1.30-dev-6-g87f618f
# will be automatically sourced from bashbot # will be automatically sourced from bashbot
@ -149,9 +149,10 @@ send_sticker() {
} }
if [ -z "${BASHBOT_WGET}" ] && _exists curl ; then # only curl can send files ...
# there are no checks if URL or ID exists if detect_curl ; then
# $1 chat $3 ... $n URL or ID # there are no checks if URL or ID exists
# $1 chat $3 ... $n URL or ID
send_album(){ send_album(){
[ -z "$1" ] && return 1 [ -z "$1" ] && return 1
[ -z "$3" ] && return 2 # minimum 2 files [ -z "$3" ] && return 2 # minimum 2 files
@ -169,7 +170,7 @@ if [ -z "${BASHBOT_WGET}" ] && _exists curl ; then
} }
else else
send_album(){ send_album(){
log_error "Sorry, wget Album upload not yet implemented" log_error "Sorry, wget Album upload not implemented"
BOTSENT[OK]="false" BOTSENT[OK]="false"
[[ -z "${SOURCE}" && -n "${BASHBOT_EVENT_SEND[*]}" ]] && event_send "album" "$@" & [[ -z "${SOURCE}" && -n "${BASHBOT_EVENT_SEND[*]}" ]] && event_send "album" "$@" &
} }