From d521d358156aa9590c411e67774ffa1567338ecb Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Sun, 10 Jan 2021 19:21:18 +0100
Subject: [PATCH] init: bashbot.rc: adjust botname

---
 bashbot.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/bashbot.sh b/bashbot.sh
index 3040a39..8b0f279 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.25-dev-54-gbd664da
+#### $$VERSION$$ v1.25-dev-55-gc6c30a4
 ##################################################################
 
 # emmbeded system may claim bash but it is not
@@ -1105,7 +1105,7 @@ start_bot() {
 # initialize bot environment, user and permissions
 bot_init() {
 	[ -n "${BASHBOT_HOME}" ] && cd "${BASHBOT_HOME}" || exit 1
-	local runuser touser DEBUG="$1"
+	local runuser chown touser botname DEBUG="$1"
 	# upgrade from old version
 	# currently no action
 	printf "Check for Update actions ...\n"
@@ -1120,8 +1120,8 @@ bot_init() {
 	# ask for bashbot user
 	runuser="${RUNUSER}"; [ "${UID}" = "0" ] && runuser="nobody"
 	printf "Enter User to run bashbot [${runuser}]: "
-	read -r touser
-	[ -z "${touser}" ] && touser="${runuser}"
+	read -r chown
+	[ -z "${chown}" ] && chown="${runuser}"; touser="${chown%:*}"
 	# check user ...
 	if ! id "${touser}" &>/dev/null; then
 		printf "${RED}User \"${touser}\" does not exist!${NN}"
@@ -1139,10 +1139,16 @@ bot_init() {
 	chmod -R o-r,o-w "${COUNTFILE}"* "${BLOCKEDFILE}"* "${DATADIR}" "${BOTACL}" 2>/dev/null
 	# jsshDB must writeable by owner
 	find . -name '*.jssh*' -exec chmod u+w \{\} +
-	chown -R "${touser}" . ./*
+	chown -Rf "${chown}" . ./*
 	printf "Done.\n"
 	# adjust values in bashbot.rc
-	[ -w "bashbot.rc" ] && sed -i '/^[# ]*runas=/ s/runas=.*$/runas="'"${touser}"'"/' "bashbot.rc"
+	if [ -w "bashbot.rc" ]; then
+		printf "Adjust user and botname in bashbot.rc ...\n"
+		sed -i '/^[# ]*runas=/ s/runas=.*$/runas="'"${touser}"'"/' "bashbot.rc"
+		botname="$(getConfigKey "botname")"
+		[ -n "${botname}" ] && sed -i '/^[# ]*name=/ s/name=.*$/name="'"${botname}"'"/' "bashbot.rc"
+		printf "Done.\n"
+	fi
 	# ask to check bottoken online
 	if [ -z "$(getConfigKey "botid")" ]; then
 		printf "Seems to be your first init. Should I verify your bot token online? (y/N) N\b"