From c356143be48e8351c19a9af140ee488260d00280 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Thu, 17 Dec 2020 08:43:30 +0100 Subject: [PATCH] fix scripts BASHBOT_HOME --- bin/send_broadcast.sh | 6 +++--- bin/send_message.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/send_broadcast.sh b/bin/send_broadcast.sh index 9461642..55bad9b 100755 --- a/bin/send_broadcast.sh +++ b/bin/send_broadcast.sh @@ -23,12 +23,11 @@ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 16.12.2020 16:14:57 # -#### $$VERSION$$ v1.2-dev2-30-ge6223b6 +#### $$VERSION$$ v1.2-dev2-33-g1dd546b #=============================================================================== # set where your bashbot lives -# shellcheck disable=SC1090 -BASHBOT_HOME="${BASHBOTHOME:-../}" +BASHBOT_HOME="$(cd "${BASH_SOURCE[0]%/*}" >/dev/null 2>&1 && pwd)/../" # check for botconfig.jssh if [ ! -r "${BASHBOT_HOME}/botconfig.jssh" ]; then @@ -82,6 +81,7 @@ case "$1" in esac # source bashbot +# shellcheck disable=SC1090 source "${BASHBOT_HOME}/bashbot.sh" source "$3" # read in users diff --git a/bin/send_message.sh b/bin/send_message.sh index e1d59d8..d552be5 100755 --- a/bin/send_message.sh +++ b/bin/send_message.sh @@ -21,12 +21,11 @@ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # CREATED: 16.12.2020 11:34:27 # -#### $$VERSION$$ v1.2-dev2-29-g85ee757 +#### $$VERSION$$ v1.2-dev2-33-g1dd546b #=============================================================================== # set where your bashbot lives -# shellcheck disable=SC1090 -BASHBOT_HOME="${BASHBOTHOME:-../}" +BASHBOT_HOME="$(cd "${BASH_SOURCE[0]%/*}" >/dev/null 2>&1 && pwd)/../" # check for botconfig.jssh if [ ! -r "${BASHBOT_HOME}/botconfig.jssh" ]; then @@ -68,6 +67,7 @@ if [[ "$1" == *[!0-9-]* ]]; then fi # source bashbot and send message +# shellcheck disable=SC1090 source "${BASHBOT_HOME}/bashbot.sh" source "$3" "${SEND}" "$1" "$2"