From 553b356822e09de1221fe3fde250718a2a407e3a Mon Sep 17 00:00:00 2001
From: "Esteban Mackay Q." <setcom40@gmail.com>
Date: Mon, 17 Jun 2024 18:40:50 -0500
Subject: [PATCH] module

---
 easy-fdmr.sh | 22 ++++++++++++++++------
 update.sh    |  3 ++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/easy-fdmr.sh b/easy-fdmr.sh
index 9190d60..cd6d3a4 100644
--- a/easy-fdmr.sh
+++ b/easy-fdmr.sh
@@ -54,7 +54,7 @@ rm get-pip.*
 apt-get install -y libssl-dev
 
 python3 -m pip install pip setuptools
-python3 -m pip install cryptography Twisted bitstring MarkupSafe bitarray configparser aprslib attrs wheel service_identity pyOpenSSL mysqlclient tinydb ansi2html mysql-connector-python pandas xlsxwriter cursor pynmea2 maidenhead flask folium mysql-connector resettabletimer setproctitle requests libscrc Pyro5
+python3 -m pip install cryptography Twisted bitstring MarkupSafe bitarray configparser aprslib attrs wheel service_identity pyOpenSSL mysqlclient tinydb ansi2html mysql-connector-python pandas xlsxwriter cursor pynmea2 maidenhead flask folium mysql-connector resettabletimer setproctitle requests libscrc Pyro5 dmr_utils3 spyne autobahn jinja2 service-identity
 
 # Desactivar el entorno virtual
 deactivate
@@ -81,6 +81,16 @@ rustup default 1.72.0
 /usr/bin/python3 -m pip install --upgrade pynmea2
 /usr/bin/python3 -m pip install --upgrade spyne
 /usr/bin/python3 -m pip install --upgrade Pyro5
+/usr/bin/python3 -m pip install --upgrade bitstring 
+/usr/bin/python3 -m pip install --upgrade bitarray 
+/usr/bin/python3 -m pip install --upgrade Twisted 
+/usr/bin/python3 -m pip install --upgrade dmr_utils3 
+/usr/bin/python3 -m pip install --upgrade configparser 
+/usr/bin/python3 -m pip install --upgrade resettabletimer 
+/usr/bin/python3 -m pip install --upgrade setuptools 
+/usr/bin/python3 -m pip install --upgrade wheel 
+/usr/bin/python3 -m pip install --upgrade MarkupSafe 
+/usr/bin/python3 -m pip install --upgrade service-identity 
 
 echo "Instalación completa."
 
@@ -88,10 +98,10 @@ echo "Instalación completa."
 bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/rpiswap.sh)" &&
 bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/nginx.sh)" &&
 bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/fdmr/-/raw/main/install.sh)"
-sudo systemctl start freedmr.service
-sudo systemctl enable freedmr.service
+sudo systemctl start adn-server.service
+sudo systemctl enable adn-server.service
 sudo systemctl start proxy.service
 sudo systemctl enable proxy.service
-sudo systemctl start fdmrparrot.service
-sudo systemctl enable fdmrparrot.service
-menu-fdmr	
\ No newline at end of file
+sudo systemctl start adn-parrot.service
+sudo systemctl enable adn-parrot.service
+menu-adn	
\ No newline at end of file
diff --git a/update.sh b/update.sh
index f63eecc..2555c00 100644
--- a/update.sh
+++ b/update.sh
@@ -268,7 +268,7 @@ commands="CREATE DATABASE IF NOT EXISTS \`${newDb}\`;CREATE USER IF NOT EXISTS '
 
 #cho "${commands}" | /usr/bin/mysql -u root -p
 echo "${commands}" | /usr/bin/mysql -u root
-/usr/bin/python3 -m pip install --upgrade spyne
+
 ###############
 cd /
 if [ -f "/opt/FreeDMR/config/FreeDMR.cfg" ]
@@ -416,6 +416,7 @@ if [ "$(ls -A "/opt/ADN-DMR-Peer-Server/data/")" ]; then
 fi
 sudo chmod -R +x /opt/ADN-DMR-Peer-Server/*
 sudo chmod -R 777 /opt/ADN-DMR-Peer-Server/*
+/usr/bin/python3 -m pip install --upgrade -r requirements.txt
 ####
 cp /opt/ADN-DMR-Peer-Server/config/ADN-SAMPLE.cfg  /opt/ADN-DMR-Peer-Server/config/adn.cfg
 sudo sed -i "s/SERVER_ID:.*/SERVER_ID: $variable/g"  /opt/ADN-DMR-Peer-Server/config/adn.cfg