From 8d00b1ce0b13be73f5189c679a4b6de72d98182a Mon Sep 17 00:00:00 2001 From: Esteban Mackay Q Date: Wed, 18 Oct 2023 19:28:02 -0500 Subject: [PATCH] update --- install.sh | 34 +++++++++++++++++----------------- menu/menu-fdmr | 27 +++++++++++++-------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/install.sh b/install.sh index 9530ce0..120d880 100644 --- a/install.sh +++ b/install.sh @@ -11,7 +11,7 @@ fi bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/wifi-connect.sh)" # Lista de aplicaciones para verificar e instalar -apps=("sudo" "curl" "git" "make" "build-essential" "libusb-1.0-0-dev" "python" "python3" "python3-pip" "chkconfig" "git-core" "libi2c-dev" "i2c-tools" "lm-sensors" "python3-websockets" "python3-gpiozero" "python3-psutil" "python3-serial" "wget" "sudo" "python3-dev" "python3-venv" "libffi-dev" "libssl-dev" "cargo" "pkg-config" "sed" "default-libmysqlclient-dev" "libmysqlclient-dev" "build-essential" "zip" "unzip" "python3-distutils" "python3-twisted" "python3-bitarray" "rrdtool" "openssl" "wavemon" "gcc" "g++" "cmake" "libasound2-dev" "libudev-dev" "gpsd" "libgps-dev" "gpsd-clients" "gpsd-tools" "chrony") +apps=("sudo" "curl" "git" "make" "build-essential" "libusb-1.0-0-dev" "python" "python3" "python3-full" "python3-pip" "chkconfig" "git-core" "libi2c-dev" "i2c-tools" "lm-sensors" "python3-websockets" "python3-gpiozero" "python3-psutil" "python3-serial" "wget" "sudo" "python3-dev" "python3-venv" "libffi-dev" "libssl-dev" "cargo" "pkg-config" "sed" "default-libmysqlclient-dev" "libmysqlclient-dev" "build-essential" "zip" "unzip" "python3-distutils" "python3-twisted" "python3-bitarray" "rrdtool" "openssl" "wavemon" "gcc" "g++" "cmake" "libasound2-dev" "libudev-dev" "gpsd" "libgps-dev" "gpsd-clients" "gpsd-tools" "chrony") # Función para verificar e instalar una aplicación check_and_install() { @@ -54,8 +54,8 @@ rm get-pip.* # Instalar paquetes en el entorno virtual 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 pip setuptools --break-system-packages +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 --break-system-packages # Desactivar el entorno virtual deactivate @@ -70,20 +70,20 @@ source $HOME/.cargo/env rustup install 1.72.0 rustup default 1.72.0 -/usr/bin/python3 -m pip install --upgrade pyOpenSSL -/usr/bin/python3 -m pip install --upgrade autobahn -/usr/bin/python3 -m pip install --upgrade jinja2 -/usr/bin/python3 -m pip install --upgrade dmr-utils3 -/usr/bin/python3 -m pip install --upgrade ansi2html -/usr/bin/python3 -m pip install --upgrade aprslib -/usr/bin/python3 -m pip install --upgrade tinydb -/usr/bin/python3 -m pip install --upgrade mysqlclient -/usr/bin/python3 -m pip install --upgrade setproctitle -/usr/bin/python3 -m pip install --upgrade pynmea2 -/usr/bin/python3 -m pip install --upgrade maidenhead -/usr/bin/python3 -m pip install --upgrade Twisted -/usr/bin/python3 -m pip install --upgrade spyne -/usr/bin/python3 -m pip install --upgrade Pyro5 +/usr/bin/python3 -m pip install --upgrade pyOpenSSL --break-system-packages +/usr/bin/python3 -m pip install --upgrade autobahn --break-system-packages +/usr/bin/python3 -m pip install --upgrade jinja2 --break-system-packages +/usr/bin/python3 -m pip install --upgrade dmr-utils3 --break-system-packages +/usr/bin/python3 -m pip install --upgrade ansi2html --break-system-packages +/usr/bin/python3 -m pip install --upgrade aprslib --break-system-packages +/usr/bin/python3 -m pip install --upgrade tinydb --break-system-packages +/usr/bin/python3 -m pip install --upgrade mysqlclient --break-system-packages +/usr/bin/python3 -m pip install --upgrade setproctitle --break-system-packages +/usr/bin/python3 -m pip install --upgrade pynmea2 --break-system-packages +/usr/bin/python3 -m pip install --upgrade maidenhead --break-system-packages +/usr/bin/python3 -m pip install --upgrade Twisted --break-system-packages +/usr/bin/python3 -m pip install --upgrade spyne --break-system-packages +/usr/bin/python3 -m pip install --upgrade Pyro5 --break-system-packages echo "Instalación completa." diff --git a/menu/menu-fdmr b/menu/menu-fdmr index a89ca3f..42898f3 100644 --- a/menu/menu-fdmr +++ b/menu/menu-fdmr @@ -108,35 +108,34 @@ while : ; do esac ;; 3) + sudo systemctl stop fdmrparrot.service + sudo systemctl stop proxy.service + sudo systemctl stop freedmr.service if ! systemctl status mariadb.service | grep "Active: active" >/dev/null 2>&1 then sudo systemctl stop mariadb.service sudo systemctl start mariadb.service fi - if ! systemctl status mariadb.service | grep "service; enabled;" >/dev/null 2>&1 then sudo systemctl enable mariadb.service - sudo systemctl enable fdmrparrot.service - sudo systemctl enable proxy.service - sudo systemctl enable freedmr.service - sudo systemctl stop fdmrparrot.service - sudo systemctl stop proxy.service - sudo systemctl stop freedmr.service - sudo systemctl start freedmr.service - sudo systemctl start fdmrparrot.service - sudo systemctl start proxy.service - if sudo systemctl status fdmr_mon.service |grep "service; enabled;" >/dev/null 2>&1 + fi + if sudo systemctl status fdmr_mon.service |grep "service; enabled;" >/dev/null 2>&1 then sudo systemctl stop fdmr_mon.service sudo systemctl start fdmr_mon.service - fi - if sudo systemctl status fdmr_mon2.service |grep "service; enabled;" >/dev/null 2>&1 + fi + if sudo systemctl status fdmr_mon2.service |grep "service; enabled;" >/dev/null 2>&1 then sudo systemctl stop fdmr_mon2.service sudo systemctl start fdmr_mon2.service - fi fi + sudo systemctl start freedmr.service + sudo systemctl start fdmrparrot.service + sudo systemctl start proxy.service + sudo systemctl enable fdmrparrot.service + sudo systemctl enable proxy.service + sudo systemctl enable freedmr.service ;; 4) sudo systemctl stop fdmrparrot.service