update

install.sh

@@ -27,9 +27,10 @@ for app in "${apps[@]}"; do
 done
 #############
 apt-get install python3-venv -y
-python3 -m venv env0 &&
+python3 -m venv env0
-source env0/bin/activate &&
+source env0/bin/activate
 pip3 install --upgrade pip
+pip install pyopenssl --upgrade
 deactivate
 
 ##################
@@ -462,12 +463,7 @@ done
 sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/html/*.*
 sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/sysinfo/*.*
 # Install the required support programs
-sudo -H pip3 install --upgrade pip
+sudo pip install -U -r requirements.txt
-python3 -m venv env0 &&
-source env0/bin/activate &&
-pip3 install -r requirements.txt
-deactivate
-pip install pyopenssl --upgrade
 cd /opt/FDMR-Monitor/
 cp /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg /opt/FDMR-Monitor/fdmr-mon.cfg
 ###############################
@@ -930,11 +926,7 @@ cd /opt
 sudo git clone https://github.com/CS8ABG/FDMR-Monitor.git /opt/FDMR-Monitor2
 cd /opt/FDMR-Monitor2
 sudo git checkout Self_Service
-
+sudo pip install -U -r requirements.txt
-python3 -m venv env0 &&
-source env0/bin/activate &&
-pip3 install -r requirements.txt
-deactivate
 chmod 755 /opt/FDMR-Monitor2/data
 
 #sed -i '72d' /opt/FDMR-Monitor2/html/include/navbar.php

update.sh

@@ -19,9 +19,10 @@ for app in "${apps[@]}"; do
 done
 #############
 apt-get install python3-venv -y
-python3 -m venv env0 &&
+python3 -m venv env0
-source env0/bin/activate &&
+source env0/bin/activate
 pip3 install --upgrade pip
+pip install pyopenssl --upgrade
 deactivate
 
 ##################
@@ -697,12 +698,7 @@ sudo sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/html/*.*
 sudo sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/sysinfo/*.*
 # Install the required support programs
 
-sudo -H pip3 install --upgrade pip
+sudo pip install -U -r requirements.txt
-python3 -m venv env0 &&
-source env0/bin/activate &&
-pip3 install -r requirements.txt
-deactivate
-pip install pyopenssl --upgrade
 cd /opt/FDMR-Monitor/
 cp /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg /opt/FDMR-Monitor/fdmr-mon.cfg
 ###############################
@@ -1231,12 +1227,8 @@ cd /opt
 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
+sudo pip install -U -r requirements.txt
-python3 -m venv env0 &&
+
-source env0/bin/activate &&
-pip3 install -r requirements.txt
-deactivate
-pip install pyopenssl --upgrade
 chmod 777 /opt/FDMR-Monitor2/data
 
 #sed -i '72d' /opt/FDMR-Monitor2/html/include/navbar.php