From 232a16bc90536379450752b6a65a4d42dee6894e Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Sat, 26 Dec 2020 20:39:21 +0100
Subject: [PATCH] bin/ check files before include

---
 bin/bashbot_env.inc.sh | 16 ++++++++--------
 doc/7_develop.md       |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/bashbot_env.inc.sh b/bin/bashbot_env.inc.sh
index 5e18fd9..22d850b 100644
--- a/bin/bashbot_env.inc.sh
+++ b/bin/bashbot_env.inc.sh
@@ -13,7 +13,7 @@
 #        AUTHOR: KayM (gnadelwartz), kay@rrr.de
 #       CREATED: 18.12.2020 12:27
 #
-#### $$VERSION$$ v1.20-0-g2ab00a2
+#### $$VERSION$$ v1.20-2-g00af5b8
 #===============================================================================
 
 ############
@@ -36,15 +36,8 @@ BASHBOT_ETC="${BASHBOT_HOME}"
 if [ ! -r "${BASHBOT_HOME}/bashbot.sh" ]; then
 	echo "Bashbot.sh not found in \"${BASHBOT_HOME}\""
 	exit 4
-else
-	# shellcheck disable=SC1090
-	source "${BASHBOT_HOME}/bashbot.sh" source "$1"
 fi
 
-# overwrite bot FILE regex to BASHBOT_ETC
-# change this to the location you want to allow file uploads from
-FILE_REGEX="${BASHBOT_ETC%/bin*}/.*"
-
 # 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."
@@ -56,6 +49,13 @@ if [ ! -r "${BASHBOT_VAR}/count.jssh" ]; then
 	exit 3
 fi
 
+# shellcheck disable=SC1090
+source "${BASHBOT_HOME}/bashbot.sh" source "$1"
+
+# overwrite bot FILE regex to BASHBOT_ETC
+# change this to the location you want to allow file uploads from
+FILE_REGEX="${BASHBOT_ETC%/bin*}/.*"
+
 # get and check ADMIN and NAME
 BOT_ADMIN="$(getConfigKey "botadmin")"
 BOT_NAME="$(getConfigKey "botname")"
diff --git a/doc/7_develop.md b/doc/7_develop.md
index 64b3633..c021373 100644
--- a/doc/7_develop.md
+++ b/doc/7_develop.md
@@ -351,5 +351,5 @@ fi
 
 #### [Prev Function Reference](6_reference.md)
 
-#### $$VERSION$$ v1.20-1-g239dd76
+#### $$VERSION$$ v1.20-2-g00af5b8