From 9492f9828a8f772190af90640584610d8f3c1b8d Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Sat, 2 Jan 2021 13:51:38 +0100 Subject: [PATCH] tests: FIX start echo printf conversion --- test/ALL-tests.inc.sh | 50 +------------------------------------------ 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/test/ALL-tests.inc.sh b/test/ALL-tests.inc.sh index d0f0fbc..db3b836 100644 --- a/test/ALL-tests.inc.sh +++ b/test/ALL-tests.inc.sh @@ -11,57 +11,9 @@ # LICENSE: WTFPLv2 http://www.wtfpl.net/txt/copying/ # AUTHOR: KayM (gnadelwartz), kay@rrr.de # -#### $$VERSION$$ v1.21-pre-32-gd70a461 +#### $$VERSION$$ v1.21-pre-33-g16e2077 #=============================================================================== -############ -# set where your bashbot lives -export BASHBOT_HOME BASHBOT_ETC BASHBOT_VAR FILE_REGEX - -# default: one dir up -BASHBOT_HOME="$(cd "${BASH_SOURCE[0]%/*}" >/dev/null 2>&1 && pwd)/../" -[ "${BASHBOT_HOME}" = "/../" ] && BASHBOT_HOME="../" - -# set you own BASHBOT_HOME if different, e.g. -# BASHBOT_HOME="/usr/local/telegram-bot-bash" -BASHBOT_VAR="${BASHBOT_HOME}" -BASHBOT_ETC="${BASHBOT_HOME}" - -##### -# if files are not readable, eviroment is wrong or bashbot is not initialized - -# source bashbot -if [ ! -r "${BASHBOT_HOME}/bashbot.sh" ]; then - echo "Bashbot.sh not found in \"${BASHBOT_HOME}\"" - exit 4 -fi - -# check for botconfig.jssh readable -if [ ! -r "${BASHBOT_ETC}/botconfig.jssh" ]; then - echo "Bashbot config file in \"${BASHBOT_ETC}\" does not exist or is not readable." - exit 3 -fi -# check for count.jssh readable -if [ ! -r "${BASHBOT_VAR}/count.jssh" ]; then - echo "Bashbot count file in \"${BASHBOT_VAR}\" does not exist or is not readable. Did you run bashbot init?" - exit 3 -fi - -# shellcheck disable=SC1090 -source "${BASHBOT_HOME}/bashbot.sh" source "$1" - -# overwrite bot FILE regex to BASHBOT_VAR -# change this to the location you want to allow file uploads from -UPLOADDIR="${BASHBOT_VAR%/bin*}" -FILE_REGEX="${UPLOADDIR}/.*" - -# get and check ADMIN and NAME -BOT_ADMIN="$(getConfigKey "botadmin")" -BOT_NAME="$(getConfigKey "botname")" -[[ -z "${BOT_ADMIN}" || "${BOT_ADMIN}" == "?" ]] && echo -e "${ORANGE}Warning: Botadmin not set, did you forget to sent command${NC} /start" -[[ -z "${BOT_NAME}" ]] && echo -e "${ORANGE}Warning: Botname not set, did you ever run bashbot?" - - # common variables export TESTME DIRME TESTDIR LOGFILE REFDIR TESTNAME TESTME="$(basename "$0")"