From c37931ea3dbfd6bdf9b027790bce7737a7dea667 Mon Sep 17 00:00:00 2001 From: "Esteban Mackay Q." Date: Tue, 28 Jan 2025 22:53:15 -0500 Subject: [PATCH] . --- easy-fdmr.sh | 135 +++++++++++++++++++++++++-------------------------- install.sh | 20 ++++---- update-b.sh | 5 +- update.sh | 27 ++++------- 4 files changed, 87 insertions(+), 100 deletions(-) diff --git a/easy-fdmr.sh b/easy-fdmr.sh index 460109c..41a38ec 100644 --- a/easy-fdmr.sh +++ b/easy-fdmr.sh @@ -1,39 +1,62 @@ #!/bin/bash -# Verificar si el usuario tiene permisos de root -if [[ $EUID -ne 0 ]]; then - echo "Este script debe ejecutarse como usuario ROOT" +if [ $EUID -ne 0 ]; then + whiptail --title "sudo su" --msgbox "requiere ser usuario root , escriba (sudo su) antes de entrar a menu / requires root user, type (sudo su) before entering menu" 0 50 + exit 0 +fi + +# Detectar el sistema operativo y su versión +if [ -f "/etc/os-release" ]; then + . /etc/os-release + OS=$ID + VERSION=$VERSION_ID +else + echo "No se pudo detectar el sistema operativo." exit 1 fi + # Actualizar la lista de paquetes una vez al principio - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get upgrade -y +apt-get update + +# Ejecutar actualización completa +DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y + +# Verificar si es necesario ejecutar autoremove +if apt-get --dry-run autoremove | grep -q "The following packages will be REMOVED:"; then + echo "Ejecutando autoremove..." + apt-get autoremove -y +else + echo "No es necesario ejecutar autoremove." +fi # 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 python3 python3-pip libi2c-dev i2c-tools lm-sensors wget python3-dev python3-venv libffi-dev libssl-dev cargo pkg-config sed libmariadb-dev zip unzip rrdtool openssl wavemon gcc g++ cmake libasound2-dev libudev-dev gpsd libgps-dev gpsd-clients gpsd-tools chrony libsamplerate0-dev" # Función para verificar e instalar una aplicación check_and_install() { app=$1 if ! dpkg -s $app 2>/dev/null | grep -q "Status: install ok installed"; then echo "$app no está instalado. Instalando..." - apt-get install -y $app - echo "$app instalado correctamente." + DEBIAN_FRONTEND=noninteractive apt-get install -y $app || true + if dpkg -s $app 2>/dev/null | grep -q "Status: install ok installed"; then + echo "$app instalado correctamente." + else + echo "No se pudo instalar $app. Continuando con la siguiente aplicación..." + fi else echo "$app ya está instalado." fi } # Verificar e instalar cada aplicación -for app in "${apps[@]}"; do +for app in $apps; do check_and_install $app done -bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ipv6off.sh)" && # Verificar y actualizar python3-venv si no está instalado if ! dpkg -s python3-venv >/dev/null 2>&1; then echo "python3-venv no está instalado. Instalando..." - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y python3-venv + apt-get install python3-venv -y echo "python3-venv instalado correctamente." fi @@ -43,9 +66,8 @@ python3 -m venv myenv source myenv/bin/activate # Instalar pip en el entorno virtual -if [ -f "/opt/get-pip.py" ] -then - rm /opt/get-pip.* +if [ -f "/opt/get-pip.py" ]; then + rm /opt/get-pip.* fi wget https://bootstrap.pypa.io/pip/get-pip.py python3 get-pip.py @@ -60,9 +82,6 @@ python3 -m pip install cryptography Twisted bitstring MarkupSafe bitarray config # Desactivar el entorno virtual deactivate -#pip install cryptography pyopenssl autobahn 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 - -cd /opt # Instalar Rust y configurar versión curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source $HOME/.cargo/env @@ -70,63 +89,41 @@ source $HOME/.cargo/env rustup install 1.72.0 rustup default 1.72.0 -if [ -f "/etc/os-release" ]; then - source /etc/os-release - - if [ "$VERSION_ID" == "12" ]; then - /usr/bin/python3 -m pip install --break-system-packages pyOpenSSL - /usr/bin/python3 -m pip install --break-system-packages autobahn - /usr/bin/python3 -m pip install --break-system-packages jinja2 - /usr/bin/python3 -m pip install --break-system-packages dmr-utils3 - /usr/bin/python3 -m pip install --break-system-packages ansi2html - /usr/bin/python3 -m pip install --break-system-packages aprslib - /usr/bin/python3 -m pip install --break-system-packages tinydb - /usr/bin/python3 -m pip install --break-system-packages mysqlclient - /usr/bin/python3 -m pip install --break-system-packages setproctitle - /usr/bin/python3 -m pip install --break-system-packages pynmea2 - /usr/bin/python3 -m pip install --break-system-packages maidenhead - /usr/bin/python3 -m pip install --break-system-packages Twisted - /usr/bin/python3 -m pip install --break-system-packages spyne - /usr/bin/python3 -m pip install --break-system-packages Pyro5 - /usr/bin/python3 -m pip install --break-system-packages bitstring - /usr/bin/python3 -m pip install --break-system-packages bitarray - /usr/bin/python3 -m pip install --break-system-packages dmr_utils3 - /usr/bin/python3 -m pip install --break-system-packages configparser - /usr/bin/python3 -m pip install --break-system-packages resettabletimer - /usr/bin/python3 -m pip install --break-system-packages setuptools - /usr/bin/python3 -m pip install --break-system-packages wheel - /usr/bin/python3 -m pip install --break-system-packages MarkupSafe - /usr/bin/python3 -m pip install --break-system-packages service-identity - else - /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 bitstring - /usr/bin/python3 -m pip install --upgrade bitarray - /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 - fi +# Instalación de módulos pip según el sistema operativo +if [ "$OS" == "debian" ] && [ "$VERSION" == "12" ]; then + /usr/bin/python3 -m pip install --break-system-packages pyOpenSSL autobahn jinja2 dmr-utils3 ansi2html aprslib tinydb mysqlclient setproctitle pynmea2 maidenhead Twisted spyne Pyro5 bitstring bitarray dmr_utils3 configparser resettabletimer setuptools wheel MarkupSafe service-identity +else + /usr/bin/python3 -m pip install --upgrade pyOpenSSL autobahn jinja2 dmr-utils3 ansi2html aprslib tinydb mysqlclient setproctitle pynmea2 maidenhead Twisted spyne Pyro5 bitstring bitarray dmr_utils3 configparser resettabletimer setuptools wheel MarkupSafe service-identity fi + sudo pip3 uninstall -y twisted --quiet sudo pip3 install twisted --quiet echo "Instalación completa." +# Configuración adicional (timezone, cron, etc.) +sudo timedatectl set-timezone America/Panama + +# Crear script para editar cronjobs +cat > /usr/local/bin/cronedit.sh <<- "EOF" +cronjob_editor () { +# usage: cronjob_editor '' '' + +if [[ -z "$1" ]] ;then printf " no interval specified\n" ;fi +if [[ -z "$2" ]] ;then printf " no command specified\n" ;fi +if [[ -z "$3" ]] ;then printf " no action specified\n" ;fi + +if [[ "$3" == add ]] ;then + # add cronjob, no duplication: + ( sudo crontab -l | grep -v -F -w "$2" ; echo "$1 $2" ) | sudo crontab - +elif [[ "$3" == remove ]] ;then + # remove cronjob: + ( sudo crontab -l | grep -v -F -w "$2" ) | sudo crontab - +fi +} +cronjob_editor "$1" "$2" "$3" +EOF +sudo chmod +x /usr/local/bin/cronedit.sh + ####### 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)" && diff --git a/install.sh b/install.sh index b638ce4..70f8a18 100644 --- a/install.sh +++ b/install.sh @@ -1,8 +1,8 @@ #!/bin/bash # Verificar si el usuario tiene permisos de root -if [[ $EUID -ne 0 ]]; then - echo "Este script debe ejecutarse como usuario ROOT" - exit 1 +if [ $EUID -ne 0 ]; then + whiptail --title "sudo su" --msgbox "requiere ser usuario root , escriba (sudo su) antes de entrar a menu / requires root user, type (sudo su) before entering menu" 0 50 + exit 0 fi if command -v apache2 >/dev/null 2>&1; then echo "Apache está instalado." @@ -57,7 +57,6 @@ then #echo "found file" else echo "file not found" - fi if [ -f "/opt/FreeDMR/config/FreeDMR.cfg" ] then @@ -73,12 +72,11 @@ then fi if [ -z "$variable" ] then variable=0000 - fi -SERVICIOS=("adn-server.service" "freedmr.service" "proxy.service" "adn-parrot.service" "fdmrparrot.service" "adn_server.service" "adn_proxy.service" "adn_parrot.service" "adn_dashboard") +SERVICIOS="adn-server.service freedmr.service proxy.service adn-parrot.service fdmrparrot.service adn_server.service adn_proxy.service adn_parrot.service adn_dashboard" -for servicio in "${SERVICIOS[@]}"; do +for servicio in $SERVICIOS; do # Verificar si el servicio existe if systemctl list-unit-files --type=service | grep -q "^$servicio "; then echo "El servicio $servicio existe." @@ -94,11 +92,11 @@ for servicio in "${SERVICIOS[@]}"; do # Deshabilitar el servicio echo "Deshabilitando el servicio $servicio..." sudo systemctl disable $servicio - else echo "El servicio $servicio no existe." fi done + if [ -f "/lib/systemd/system/fdmrparrot.service" ]; then rm /lib/systemd/system/fdmrparrot.service @@ -220,14 +218,14 @@ sudo chmod +x /opt/extra-* ######################### #lamp #"libapache2-mod-php" -apps=("mariadb-server" "php" "php-zip" "php-mbstring" "php-cli" "php-common" "php-curl" "php-xml" "php-mysql") +apps="mariadb-server php php-zip php-mbstring php-cli php-common php-curl php-xml php-mysql" # Función para verificar e instalar una aplicación check_and_install() { app=$1 if ! dpkg -s $app 2>/dev/null | grep -q "Status: install ok installed"; then echo "$app no está instalado. Instalando..." - apt-get install -y $app + sudo apt-get install -y $app echo "$app instalado correctamente." else echo "$app ya está instalado." @@ -235,7 +233,7 @@ check_and_install() { } # Verificar e instalar cada aplicación -for app in "${apps[@]}"; do +for app in $apps; do check_and_install $app done sudo systemctl restart mariadb && diff --git a/update-b.sh b/update-b.sh index 41d2e99..0c6b199 100644 --- a/update-b.sh +++ b/update-b.sh @@ -6,9 +6,9 @@ if [[ $EUID -ne 0 ]]; then exit 1 fi #whiptail --title "FreeDMR Bridge - Update" --msgbox "scrip sin actualizaciones disponibles / scrip no updates available" 0 50 -SERVICIOS=("http.server-fdmr-b.service" "http.server-fdmr-b2.service") +SERVICIOS="http.server-fdmr-b.service http.server-fdmr-b2.service" -for servicio in "${SERVICIOS[@]}"; do +for servicio in $SERVICIOS; do # Verificar si el servicio existe if systemctl list-unit-files --type=service | grep -q "^$servicio "; then echo "El servicio $servicio existe." @@ -24,7 +24,6 @@ for servicio in "${SERVICIOS[@]}"; do # Deshabilitar el servicio echo "Deshabilitando el servicio $servicio..." sudo systemctl disable $servicio - else echo "El servicio $servicio no existe." fi diff --git a/update.sh b/update.sh index 5d9fb04..c081611 100644 --- a/update.sh +++ b/update.sh @@ -231,14 +231,14 @@ EOF sudo cat > /opt/fdmr-update.sh <<- "EOFD1" #!/bin/bash #"libapache2-mod-php" -apps=("mariadb-server" "php" "php-zip" "php-mbstring" "php-cli" "php-common" "php-curl" "php-xml" "php-mysql") +apps="mariadb-server php php-zip php-mbstring php-cli php-common php-curl php-xml php-mysql" # Función para verificar e instalar una aplicación check_and_install() { app=$1 if ! dpkg -s $app 2>/dev/null | grep -q "Status: install ok installed"; then echo "$app no está instalado. Instalando..." - apt-get install -y $app + sudo apt-get install -y $app echo "$app instalado correctamente." else echo "$app ya está instalado." @@ -246,7 +246,7 @@ check_and_install() { } # Verificar e instalar cada aplicación -for app in "${apps[@]}"; do +for app in $apps; do check_and_install $app done sudo systemctl restart mariadb && @@ -288,10 +288,9 @@ if [ -z "$variable" ] then variable=0000 fi +SERVICIOS="adn-server.service freedmr.service proxy.service adn-parrot.service fdmrparrot.service adn_server.service adn_proxy.service adn_parrot.service" -SERVICIOS=("adn-server.service" "freedmr.service" "proxy.service" "adn-parrot.service" "fdmrparrot.service" "adn_server.service" "adn_proxy.service" "adn_parrot.service") - -for servicio in "${SERVICIOS[@]}"; do +for servicio in $SERVICIOS; do # Verificar si el servicio existe if systemctl list-unit-files --type=service | grep -q "^$servicio "; then echo "El servicio $servicio existe." @@ -307,11 +306,11 @@ for servicio in "${SERVICIOS[@]}"; do # Deshabilitar el servicio echo "Deshabilitando el servicio $servicio..." sudo systemctl disable $servicio - else echo "El servicio $servicio no existe." fi done + if [ -f "/lib/systemd/system/fdmrparrot.service" ]; then rm /lib/systemd/system/fdmrparrot.service @@ -510,9 +509,9 @@ variable4=$(grep "COLOR_1 =" /opt/FDMR-Monitor/fdmr-mon.cfg) variable5=$(grep "COLOR_2 =" /opt/FDMR-Monitor/fdmr-mon.cfg) ##################################### -SERVICIOS=("adn_dashboard.service" "apache2.service") +SERVICIOS="adn_dashboard.service apache2.service" -for servicio in "${SERVICIOS[@]}"; do +for servicio in $SERVICIOS; do # Verificar si el servicio existe if systemctl list-unit-files --type=service | grep -q "^$servicio "; then echo "El servicio $servicio existe." @@ -525,11 +524,6 @@ for servicio in "${SERVICIOS[@]}"; do else echo "El servicio $servicio no está activo." fi - - # Deshabilitar el servicio - echo "Deshabilitando el servicio $servicio..." - sudo systemctl disable $servicio - else echo "El servicio $servicio no existe." fi @@ -805,9 +799,9 @@ if ! grep -q "Web-Dashboar-name: adn" "/opt/wdp" > /dev/null 2>&1; then sed -i "s|Web-Dashboar-name:.*|Web-Dashboar-name: adn|g" /opt/wdp fi ############## -SERVICIOS=("adn_dashboard.service" "apache2.service") +SERVICIOS="adn_dashboard.service apache2.service" -for servicio in "${SERVICIOS[@]}"; do +for servicio in $SERVICIOS; do # Verificar si el servicio existe if systemctl list-unit-files --type=service | grep -q "^$servicio "; then echo "El servicio $servicio existe." @@ -823,7 +817,6 @@ for servicio in "${SERVICIOS[@]}"; do # Deshabilitar el servicio echo "Deshabilitando el servicio $servicio..." sudo systemctl disable $servicio - else echo "El servicio $servicio no existe." fi