diff --git a/update.sh b/update.sh index 7b1073c..13deb55 100644 --- a/update.sh +++ b/update.sh @@ -451,11 +451,9 @@ then mkdir -p /var/log/FreeDMR fi chmod +x /opt/FreeDMR/install.sh -apt-get install python3-venv -y -python3 -m venv env -source env/bin/activate + ./install.sh -deactivate + # if [ "$(cat /opt/FreeDMR/FreeDMR-SAMPLE.cfg | grep 'TOPO_FILE')" != "" ]; then sudo sed -i 's/TOPO_FILE:.*/TOPO_FILE: topography.json/' /opt/FreeDMR/FreeDMR-SAMPLE.cfg @@ -675,12 +673,10 @@ sudo apt-get install rrdtool -y 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 -apt-get install python3-venv -y -python3 -m venv env -source env/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 @@ -1195,11 +1191,9 @@ 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 -apt-get install python3-venv -y -python3 -m venv env -source env/bin/activate + pip3 install -r requirements.txt -deactivate + pip install pyopenssl --upgrade chmod 777 /opt/FDMR-Monitor2/data