From 20a969c1feb5455bffddf1f45d0788ea6d32fb82 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Fri, 29 May 2020 14:56:15 +0200
Subject: [PATCH 1/4] fix wrong BASHBOTTOKEN is not empty on startup

---
 bashbot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bashbot.sh b/bashbot.sh
index 9a34b88..cbe0e43 100755
--- a/bashbot.sh
+++ b/bashbot.sh
@@ -97,7 +97,7 @@ DATADIR="${BASHBOT_VAR:-.}/data-bot-bash"
 COUNTFILE="${BASHBOT_VAR:-.}/count"
 
 # we assume everthing is already set up correctly if we have TOKEN
-if [ -z "${BOTTOKEN}" ]; then
+if [ -n "${BOTTOKEN}" ]; then
   # BOTTOKEN empty read from file
   if [ ! -f "${TOKENFILE}" ]; then
      if [ -z "${CLEAR}" ] && [ "$1" != "init" ]; then

From 9c7a203fb3a5f1f1110fcd78bba0fea80677df33 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Fri, 29 May 2020 18:39:54 +0200
Subject: [PATCH 2/4] fix of fix for empty BOTTOKEN

---
 bashbot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bashbot.sh b/bashbot.sh
index cbe0e43..9a34b88 100755
--- a/bashbot.sh
+++ b/bashbot.sh
@@ -97,7 +97,7 @@ DATADIR="${BASHBOT_VAR:-.}/data-bot-bash"
 COUNTFILE="${BASHBOT_VAR:-.}/count"
 
 # we assume everthing is already set up correctly if we have TOKEN
-if [ -n "${BOTTOKEN}" ]; then
+if [ -z "${BOTTOKEN}" ]; then
   # BOTTOKEN empty read from file
   if [ ! -f "${TOKENFILE}" ]; then
      if [ -z "${CLEAR}" ] && [ "$1" != "init" ]; then

From ff5fb2d337f60038922056d908122a2fa5e5e8ff Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Sun, 31 May 2020 10:58:08 +0200
Subject: [PATCH 3/4] fix jssh_updateDB_async also

---
 modules/jsonDB.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/modules/jsonDB.sh b/modules/jsonDB.sh
index a856261..53f49c1 100644
--- a/modules/jsonDB.sh
+++ b/modules/jsonDB.sh
@@ -74,13 +74,11 @@ if _exists flock; then
 	else
 		# merge arrays
 		local key
-set -x
 		for key in "${!ARRAY[@]}"
 		do
 		    oldARR["${key}"]="${ARRAY["${key}"]}"
 		done
 		Array2Json  "oldARR" >"${DB}"
-set +x
 	fi
 	} 200>"${DB}${BASHBOT_LOCKNAME}"
   }
@@ -251,21 +249,19 @@ jssh_writeDB_async() {
 jssh_updateDB_async() {
 	declare -n ARRAY="$1"
 	[ -z "${ARRAY[*]}" ] && return 1
-	declare -A oldARR newARR
+	declare -A oldARR
 	jssh_readDB_async "oldARR" "$2" || return "$?"
 	if [ -z "${oldARR[*]}" ]; then
 		# no old content
 		jssh_writeDB_async "$1" "$2"
 	else
 		# merge arrays
-		local o1 o2 n1 n2
-		o1="$(declare -p oldARR)"; o2="${o1#*\(}"
-		n1="$(declare -p ARRAY)";  n2="${n1#*\(}"
-		unset IFS; set -f
-		#shellcheck disable=SC2034,SC2190,SC2206
-		newARR=( ${o2:0:${#o2}-1} ${n2:0:${#n2}-1} )
-		set +f
-		jssh_writeDB_async "newARR" "$2" 
+		local key
+		for key in "${!ARRAY[@]}"
+		do
+		    oldARR["${key}"]="${ARRAY["${key}"]}"
+		done
+		Array2Json  "oldARR" >"${DB}"
 	fi
 }
 

From 9c96e3eb808f0a5dbc1b11b2785eee4bc3a6ce30 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Thu, 4 Jun 2020 16:14:16 +0200
Subject: [PATCH 4/4] fix wrong json.sh location if included from other
 location

---
 bashbot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bashbot.sh b/bashbot.sh
index 9a34b88..49fddf0 100755
--- a/bashbot.sh
+++ b/bashbot.sh
@@ -749,7 +749,7 @@ if ! _is_function send_message ; then
 	exit 1
 fi
 
-JSONSHFILE="${BASHBOT_JSONSH:-${RUNDIR}/JSON.sh/JSON.sh}"
+JSONSHFILE="${BASHBOT_JSONSH:-${SCRIPTDIR}/JSON.sh/JSON.sh}"
 [[ "${JSONSHFILE}" != *"/JSON.sh" ]] && echo -e "${RED}ERROR: \"${JSONSHFILE}\" ends not with \"JSONS.sh\".${NC}" && exit 3
 
 if [ ! -f "${JSONSHFILE}" ]; then