From 10812d33a6d74c598383249277bfee46d9c7ef39 Mon Sep 17 00:00:00 2001
From: Esteban Mackay Q <setcom40@gmail.com>
Date: Mon, 14 Aug 2023 05:16:36 -0500
Subject: [PATCH] Update update.sh

---
 update.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/update.sh b/update.sh
index 72c71a7..de1ff0f 100644
--- a/update.sh
+++ b/update.sh
@@ -690,8 +690,8 @@ sudo sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/sysinfo/*.*
 # Install the required support programs
 
 sudo -H pip3 install --upgrade pip
-python3 -m venv env0 &&
-source env0/bin/activate &&
+python3 -m venv env0
+source env0/bin/activate
 pip3 install -r requirements.txt
 deactivate
 pip install pyopenssl --upgrade
@@ -1020,8 +1020,7 @@ if [ -f "mon.db" ]
 then
    rm mon.db
 fi
-python3 -m venv env0 &&
-source env0/bin/activate &&
+
 mysql -u root -e "DROP TABLE IF EXISTS hbmon.last_heard;" &&
 mysql -u root -e "DROP TABLE IF EXISTS hbmon.lstheard_log;" &&
 mysql -u root -e "DROP TABLE IF EXISTS hbmon.peer_ids;" &&
@@ -1031,7 +1030,7 @@ mysql -u root -e "DROP TABLE IF EXISTS hbmon.tg_count;"
 cd /opt/FDMR-Monitor
 python3 mon_db.py --create &&
 python3 mon_db.py --update
-deactivate
+
 
 systemctl stop apache2
 systemctl disable apache2
@@ -1225,8 +1224,8 @@ sudo git clone https://github.com/CS8ABG/FDMR-Monitor.git /opt/FDMR-Monitor2
 cd /opt/FDMR-Monitor2
 sudo git checkout Self_Service
 sudo -H pip3 install --upgrade pip
-python3 -m venv env0 &&
-source env0/bin/activate &&
+python3 -m venv env0
+source env0/bin/activate
 pip3 install -r requirements.txt
 deactivate
 pip install pyopenssl --upgrade
@@ -1308,8 +1307,7 @@ if [ -f "mon.db" ]
 then
    rm mon.db
 fi
-python3 -m venv env0 &&
-source env0/bin/activate &&
+
 mysql -u root -e "DROP TABLE IF EXISTS hbmon.last_heard;" &&
 mysql -u root -e "DROP TABLE IF EXISTS hbmon.lstheard_log;" &&
 mysql -u root -e "DROP TABLE IF EXISTS hbmon.peer_ids;" &&
@@ -1319,7 +1317,7 @@ mysql -u root -e "DROP TABLE IF EXISTS hbmon.tg_count;"
 cd /opt/FDMR-Monitor2
 python3 mon_db.py --create &&
 python3 mon_db.py --update
-deactivate
+
 #####################################