From f995eeea130e441b6fede884f449fe30a94163ec Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Sat, 23 Jan 2021 14:06:55 +0100 Subject: [PATCH] move JsonEscape up before sourcing other files --- bashbot.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bashbot.sh b/bashbot.sh index 980c0b0..71e9189 100755 --- a/bashbot.sh +++ b/bashbot.sh @@ -30,7 +30,7 @@ BOTCOMMANDS="-h help init start stop status suspendback resumeback killb # 8 - curl/wget missing # 10 - not bash! # -#### $$VERSION$$ v1.32-dev-11-g41e956d +#### $$VERSION$$ v1.32-dev-12-g78e4551 ################################################################## # emmbeded system may claim bash but it is not @@ -105,6 +105,12 @@ getConfigKey() { [[ "$1" =~ ^[-${azAZo9},._]+$ ]] || return 3 [ -r "${BOTCONFIG}.jssh" ] && sed -n 's/\["'"$1"'"\]\t*"\(.*\)"/\1/p' "${BOTCONFIG}.jssh" | tail -n 1 } +# escape / remove text characters for json strings, eg. " -> \" +# $1 string +# output escaped string +JsonEscape(){ + sed 's/\([-"`´,§$%&/(){}#@!?*.\t]\)/\\\1/g' <<< "$1" +} # check if $1 seems a valid token # return true if token seems to be valid check_token(){ @@ -618,13 +624,6 @@ sendJsonResult(){ fi } >>"${ERRORLOG}" -# escape / remove text characters for json strings, eg. " -> \" -# $1 string -# output escaped string -JsonEscape(){ - sed 's/\([-"`´,§$%&/(){}#@!?*.\t]\)/\\\1/g' <<< "$1" -} - # convert common telegram entities to JSON # title caption description markup inlinekeyboard title2Json(){