From 6651cf4f0a0cb2c4953b361702dbeb3bbae5426e Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Tue, 28 May 2019 21:28:58 +0200 Subject: [PATCH] _is_function process_inline is always true --- bashbot.sh | 6 +++--- commands.sh | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bashbot.sh b/bashbot.sh index 5f15457..2be58ee 100755 --- a/bashbot.sh +++ b/bashbot.sh @@ -11,7 +11,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.90-dev2-13-gcb3f3e3 +#### $$VERSION$$ v0.90-dev2-14-gafc669c # # Exit Codes: # - 0 sucess (hopefully) @@ -349,7 +349,7 @@ process_client() { process_message "${num}" "${debug}" else [[ "${debug}" = *"debug"* ]] && cat <<< "$UPDATE" >>"INLINE.log" - [ "$INLINE" != "0" ] && _exec_if_function process_inline "${num}" "${debug}" + process_inline "${num}" "${debug}" fi ##### # process inline and message events @@ -361,7 +361,7 @@ process_client() { if [ "${iQUERY[ID]}" = "" ]; then event_message "${debug}" else - _is_function process_inline && event_inline "${debug}" + event_inline "${debug}" fi # last count users diff --git a/commands.sh b/commands.sh index b8aab05..3cf4aff 100644 --- a/commands.sh +++ b/commands.sh @@ -5,7 +5,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.90-dev2-6-g3c6b2d3 +#### $$VERSION$$ v0.90-dev2-14-gafc669c # # adjust your language setting here, e.g.when run from other user or cron. @@ -59,10 +59,8 @@ if [ "${1}" != "source" ];then # detect inline commands.... # no default commands, all processing is done in myinlines() if [ "$INLINE" != "0" ] && [ "${iQUERY[ID]}" != "" ]; then - if _is_function process_inline; then - # forward iinline query to optional dispatcher - _exec_if_function myinlines - fi + # forward iinline query to optional dispatcher + _exec_if_function myinlines # regular (gobal) commands ... # your commands are in mycommands()