From 30ff526fc07c8ebd927f0551b38a0c034f9da686 Mon Sep 17 00:00:00 2001
From: Michael De Roover <condor@commander.lan>
Date: Mon, 4 Jan 2021 16:39:50 +0100
Subject: [PATCH] Move bot username into install.sh / konata.conf

---
 install.sh | 17 ++++++++++++++++-
 konata.sh  |  3 +--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index 9cc6c22..122289f 100755
--- a/install.sh
+++ b/install.sh
@@ -6,9 +6,24 @@ echo "Installing dependencies..."
 apk add lighttpd curl jq bash youtube-dl ffmpeg
 
 read -p "Please enter your bot token: " token
-echo "token=$token" > /etc/konata.conf
+read -p "Please enter the bot's username (without @): " bot
 read -p "Please enter the domain for your bot: " domain
 
+if [ -f /etc/konata.conf ]
+then
+	read -p "/etc/konata.conf already exists. Do you want to remove it? (y/n) " ans
+	if [ "$ans" == "y" ]
+	then
+		rm /etc/konata.conf
+	else
+		echo "Keeping file. Please investigate this file and run the installer again."
+		exit 1
+	fi
+else
+	echo "token=$token" >> /etc/konata.conf
+	echo "bot=$bot" >> /etc/konata.conf
+fi
+
 echo "Installing application files..."
 install -m644 lighttpd.conf /etc/lighttpd/lighttpd.conf
 mkdir /var/www/konata
diff --git a/konata.sh b/konata.sh
index e14bdaf..37aee47 100755
--- a/konata.sh
+++ b/konata.sh
@@ -5,10 +5,9 @@ printf "Content-Type: text/plain\n\n"
 
 # Initialize basic variables
 . /etc/konata.conf
-input=$(cat /dev/stdin)
-bot="konatasanbot"
 
 # Parse incoming messages
+input=$(cat /dev/stdin)
 cmd=$(jq -r '.message.text' <<< $input)
 args=$(cut -d" " -f2- <<< $cmd)
 chat=$(jq -r '.message.chat.id' <<< $input)