From eaf064561cc0d2d48e9b700971313cad0c503b14 Mon Sep 17 00:00:00 2001 From: hp3icc Date: Sun, 12 Oct 2025 17:54:52 -0500 Subject: [PATCH] Update easy-fdmr.sh --- easy-fdmr.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/easy-fdmr.sh b/easy-fdmr.sh index cf53b7d..28d638d 100644 --- a/easy-fdmr.sh +++ b/easy-fdmr.sh @@ -13,7 +13,7 @@ set -e # === ACTUALIZAR SISTEMA === apt-get update -apt-get -y full-upgrade +#apt-get -y full-upgrade # Autoremove si es necesario if apt-get --dry-run autoremove | grep -q "The following packages will be REMOVED:"; then @@ -70,23 +70,23 @@ fi echo "Detectado: OS=$OS, VERSION=$VERSION, CODENAME=$CODENAME" # === INSTALACIÓN DE MÓDULOS PYTHON === -PACKAGES="pyOpenSSL autobahn jinja2 dmr-utils3 ansi2html aprslib tinydb mysqlclient setproctitle pynmea2 maidenhead spyne \ +PACKAGES="pyOpenSSL requests autobahn jinja2 dmr-utils3 ansi2html aprslib tinydb mysqlclient setproctitle pynmea2 maidenhead spyne \ Pyro5 bitstring bitarray dmr_utils3 configparser resettabletimer setuptools wheel MarkupSafe service-identity gTTS" PIP_BASE_CMD="/usr/bin/python3 -m pip install --no-input --root-user-action=ignore --disable-pip-version-check" if [ "$OS" == "debian" ] && { [ "$VERSION" == "12" ] || [ "$VERSION" == "13" ] || [ "$CODENAME" == "trixie" ]; }; then echo "Usando instalación con --break-system-packages (Debian $VERSION)" - $PIP_BASE_CMD --upgrade --break-system-packages $PACKAGES || true + $PIP_BASE_CMD --break-system-packages $PACKAGES || true # Instalar requests sin desinstalar la versión de apt - $PIP_BASE_CMD --upgrade --break-system-packages --ignore-installed requests || true + # $PIP_BASE_CMD --break-system-packages --ignore-installed requests || true # Forzar reinstalación de Twisted específico - $PIP_BASE_CMD --break-system-packages --force-reinstall "Twisted==22.10.0" || true + # $PIP_BASE_CMD --break-system-packages "Twisted==22.10.0" || true else echo "Usando instalación estándar (no Debian 12/13)" - $PIP_BASE_CMD --upgrade $PACKAGES || true - $PIP_BASE_CMD --upgrade --ignore-installed requests || true - $PIP_BASE_CMD --force-reinstall "Twisted==22.10.0" || true + $PIP_BASE_CMD $PACKAGES || true + # $PIP_BASE_CMD --ignore-installed requests || true + $PIP_BASE_CMD "Twisted==22.10.0" || true fi echo "✅ Instalación de módulos Python completada." @@ -95,8 +95,9 @@ echo "✅ Instalación de módulos Python completada." timedatectl set-timezone America/Panama ####### -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/emq-TE1/-/raw/main/install/swappoff.sh)" || true +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/rpiswap.sh)" || true +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/nginx.sh)" || true bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/fdmr/-/raw/main/install.sh)" (crontab -l | grep -v "rm /opt/FDMR-Monitor2/data/*") | crontab -