From a4df4c13b0fc2d651c80a0bdd160f2196c1a292d Mon Sep 17 00:00:00 2001
From: hjelev <jeleff@gmail.com>
Date: Sat, 19 Mar 2022 00:34:30 +0200
Subject: [PATCH] update

---
 install.sh        | 39 +++++++++++++++++++++------------------
 remote_install.sh |  2 +-
 requirements.txt  |  1 +
 3 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 requirements.txt

diff --git a/install.sh b/install.sh
index b9717a4..46d3b76 100755
--- a/install.sh
+++ b/install.sh
@@ -1,11 +1,22 @@
 printm () {
-  line="------"
   length=$(expr length "$1")
+  length=$(($length + 4))
+  printf "\n"
   printf -- '-%.0s' $(seq $length); echo ""
-  echo "$1"
+  printf "| $1 |\n"
   printf -- '-%.0s' $(seq $length); echo ""
 }
 
+print_green () {
+		tput setaf 2; echo "$1"
+		tput sgr 0
+}
+
+print_yellow () {
+		tput setaf 3; printf "$1"
+		tput sgr 0
+}
+
 printm "Raspberry Pi MQTT monitor installer"
 
 check_and_install_pip () {
@@ -16,21 +27,13 @@ check_and_install_pip () {
 		echo "- Pip is not installed, installing it."
 		sudo apt install python-pip
 		else
-
-		tput setaf 2; echo "+ Found $pip"
-		tput sgr 0
+		print_green "+ Found $pip"
 	fi
 }
 
-check_and_install_paho () {
-	pip=$(pip list | grep "paho-mqtt");
-	if [[ "$pip" == *"paho-mqtt"* ]]; then
-		echo "+ Found $pip"
-
-	else
-		echo "- Paho-mqtt is not installed, installing it."
-		pip install paho-mqtt
-	fi
+install_requirements () {
+	printm "Installing requirements"
+	pip install -r requirements.txt
 }
 
 update_config () {
@@ -76,9 +79,9 @@ set_cron () {
 	crontab -l > tempcron
 	if grep -q rpi-cpu2mqtt.py tempcron; then
 		cronfound=$(grep rpi-cpu2mqtt.py tempcron)
-		echo " There is already a cronjob running rpi-cpu2mqtt.py - skipping cronjob creation"
-		printf " If you want the cronjob to be automatically created remove the line below from your\n cronjobs list and run the installer again.\n"
-		echo "${cronfound}"
+		print_yellow " There is already a cronjob running rpi-cpu2mqtt.py - skipping cronjob creation\n"
+		print_yellow " If you want the cronjob to be automatically created remove the line below from your\n cronjobs list and run the installer again.\n\n"
+		echo " ${cronfound}"
 	else
 
 		printf "How often do you want the script to run in minutes? "
@@ -94,7 +97,7 @@ set_cron () {
 
 main () {
 	check_and_install_pip
-	check_and_install_paho 
+	install_requirements 
 	update_config
 	set_cron
 	printm "Done"
diff --git a/remote_install.sh b/remote_install.sh
index d0c0b91..e25ad1b 100755
--- a/remote_install.sh
+++ b/remote_install.sh
@@ -7,7 +7,7 @@ printm () {
 }
 
 printm "Cloning rpi-mqtt-monitor git repository"
-echo $line
+
 git clone https://github.com/hjelev/rpi-mqtt-monitor.git
 cd rpi-mqtt-monitor
 bash install.sh
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..f6c4882
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+paho-mqtt==1.5.0