From 53ad97a442e71956ef698450c076385ccc45120c Mon Sep 17 00:00:00 2001
From: Esteban Mackay Q <setcom40@gmail.com>
Date: Mon, 14 Aug 2023 04:11:02 -0500
Subject: [PATCH] update

---
 install.sh | 12 +++++++++---
 update.sh  |  5 +----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index 50ef10e..93a95cf 100644
--- a/install.sh
+++ b/install.sh
@@ -25,8 +25,6 @@ check_and_install() {
 for app in "${apps[@]}"; do
     check_and_install $app
 done
-python3 -m venv env0 &&
-source env0/bin/activate &&
 cd /
 #####################################################################################################################
 #                                      rust
@@ -295,7 +293,10 @@ cd FreeDMR
 mkdir config
 mkdir /var/log/FreeDMR
 sudo chmod +x /opt/FreeDMR/*
+python3 -m venv env0 &&
+source env0/bin/activate &&
 ./install.sh
+deactivate
 sudo cat > /opt/conf.txt <<- "EOF"
   
 [D-APRS]
@@ -454,7 +455,10 @@ 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
+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
@@ -919,7 +923,10 @@ sudo git clone https://github.com/CS8ABG/FDMR-Monitor.git /opt/FDMR-Monitor2
 cd /opt/FDMR-Monitor2
 sudo git checkout Self_Service
 
+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
@@ -1000,7 +1007,6 @@ WantedBy=multi-user.target
 
 EOF
 #############################
-deactivate
 sudo systemctl daemon-reload
 sudo systemctl start freedmr.service
 sudo systemctl enable freedmr.service
diff --git a/update.sh b/update.sh
index c88b082..02de2ef 100644
--- a/update.sh
+++ b/update.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-apps=("git" "sudo" "curl" "wget" "sed" "zip" "unzip" "mariadb-server" "php" "libapache2-mod-php" "php-zip" "php-mbstring" "php-cli" "php-common" "php-curl" "php-xml" "php-mysql")
+apps=("git" "sudo" "curl" "wget" "sed" "zip" "unzip" "mariadb-server" "php" "libapache2-mod-php" "php-zip" "python3-venv" "php-mbstring" "php-cli" "php-common" "php-curl" "php-xml" "php-mysql")
 
 # Función para verificar e instalar una aplicación
 check_and_install() {
@@ -451,7 +451,6 @@ then
   mkdir -p /var/log/FreeDMR
 fi
 chmod +x /opt/FreeDMR/install.sh
-apt-get install python3-venv -y
 python3 -m venv env0 &&
 source env0/bin/activate &&
 ./install.sh
@@ -678,7 +677,6 @@ 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 env0 &&
 source env0/bin/activate &&
 pip3 install -r requirements.txt
@@ -1200,7 +1198,6 @@ 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 env0 &&
 source env0/bin/activate &&
 pip3 install -r requirements.txt