diff --git a/README.md b/README.md index 4c57308..50386e2 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ Puede instalar en su sistema operativo (Ubuntu , raspberry , Debian ) utilizando sudo su - bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install.sh)" + bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install.sh)" # diff --git a/install.sh b/install.sh index 4732b4e..3082745 100644 --- a/install.sh +++ b/install.sh @@ -7,7 +7,7 @@ fi # Actualizar la lista de paquetes una vez al principio apt-get update && apt-get upgrade -y -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/wifi-connect.sh)" +bash -c "$(curl -fsSLk 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-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" "libsamplerate0-dev") @@ -130,55 +130,55 @@ EOF sudo chmod +x /usr/local/bin/cronedit.sh #################### echo iniciando instalacion -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/rm.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/dvswitch.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/direwolf.sh)" && -#bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/pymultimonng.sh)" -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ysfreflector.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/mmdvm.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ysfgateway2.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/gotty.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/noip.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/python-aprs-beacon/-/raw/main/install.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/rebooters.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ysf2dmr.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/dmrgw.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/f2b+ufw.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/python-aprs-wx/-/raw/main/install.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ysf2ysf.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/easy-hbl/-/raw/main/hbl.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/easy-hbl/-/raw/main/hbljson.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/fdmr.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/fdmr/-/raw/main/fdmr-bridge.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/nxdn2dmr.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/p25.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/p25cross.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/data-mmdvm.sh)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/rm.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/dvswitch.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/direwolf.sh)" && +#bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/pymultimonng.sh)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ysfreflector.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/mmdvm.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ysfgateway2.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/gotty.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/noip.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/python-aprs-beacon/-/raw/main/install.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/rebooters.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ysf2dmr.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/dmrgw.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/f2b+ufw.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/python-aprs-wx/-/raw/main/install.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/ysf2ysf.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/easy-hbl/-/raw/main/hbl.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/easy-hbl/-/raw/main/hbljson.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/fdmr.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/fdmr/-/raw/main/fdmr-bridge.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/nxdn2dmr.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/p25.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/p25cross.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/data-mmdvm.sh)" echo install menu -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-aprs)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/python-aprs-beacon/-/raw/main/menu.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dvs)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dw)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-fdmr)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-fdmr-bridge)" && -#bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-mm-rtl)" -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-mmdvm)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-noip)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-reboot)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-web)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ysf)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ysf2dmr)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ufw)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ysf2ysf)" && -#bash -c "$(curl -fsSL https://gitlab.com/hp3icc/easy-hbl/-/raw/main/menu-hbl.sh)" -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-nxdn2dmr)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-p25r)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-wifi-manager)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ip)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-aprs)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/python-aprs-beacon/-/raw/main/menu.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dvs)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dw)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-fdmr)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-fdmr-bridge)" && +#bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-mm-rtl)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-mmdvm)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-noip)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-reboot)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-web)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ysf)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ysf2dmr)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ufw)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ysf2ysf)" && +#bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/easy-hbl/-/raw/main/menu-hbl.sh)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-nxdn2dmr)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-p25r)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-wifi-manager)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-ip)" ############################ -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/raspberry.sh)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/raspberry.sh)" # pip install --no-cache-dir --upgrade cryptography pyopenssl autobahn Twisted dmr_utils3 bitstring jinja2 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 @@ -214,7 +214,7 @@ cat > /opt/emq-ver <<- "EOF" EMQ-VER: 23.10.28 EOF ############################## -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu)" sudo chmod +x /tmp/completado.sh history -c && history -w sh /tmp/completado.sh diff --git a/install/dvswitch.sh b/install/dvswitch.sh index de0ec0c..f860512 100644 --- a/install/dvswitch.sh +++ b/install/dvswitch.sh @@ -2,7 +2,7 @@ ############################################################################################################################# # dvswitch ############################################################################################################################# -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/Easy-DVSwitch/-/raw/main/install.sh)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/Easy-DVSwitch/-/raw/main/install.sh)" sudo cat > /usr/local/dvs/dvs <<- "EOF" #!/bin/bash @@ -90,7 +90,7 @@ case $OPTION in 01\ *)sudo ${DVS}init_config.sh ;; 02\ *)sudo ${DVS}adv_config_menu.sh ;; 03\ *)sudo ${DVS}tools_menu.sh ;; -04\ *)bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/service/dv-list-tg.sh)" ;; +04\ *)bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/service/dv-list-tg.sh)" ;; 05\ *)sudo ${DVS}credits.sh ;; 06\ *)exit 0 esac diff --git a/install/fdmr.sh b/install/fdmr.sh index af8699c..08ee217 100644 --- a/install/fdmr.sh +++ b/install/fdmr.sh @@ -1,5 +1,5 @@ #!/bin/bash -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/fdmr/-/raw/main/install.sh)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/fdmr/-/raw/main/install.sh)" ###################################################################################### cronedit.sh '*/5 * * * *' 'sh /opt/FDMR-Monitor/sysinfo/graph.sh' remove && diff --git a/install/update-dash-dvs.sh b/install/update-dash-dvs.sh index 4bc46cb..070319d 100644 --- a/install/update-dash-dvs.sh +++ b/install/update-dash-dvs.sh @@ -33,7 +33,7 @@ sed -i "s/www\/html/www\/dvs/g" /var/www/dvs/include/* && sed -i "s/Dashboard based on Pi-Star Dashboard, © Andy Taylor.*/Dashboard based on Pi-Star Dashboard, © Andy Taylor (MW0MWZ) and adapted to DVSwitch by SP2ONG
\"2018\") {\$cdate=\"2018-\".date(\"Y\");} echo \$cdate; ?>\" target=\"_blank\" href=https:\/\/gitlab.com\/hp3icc\/emq-TE1\/>Proyect: emq-TE1ws+<\/a><\/span><\/center>/" /var/www/dvs/index.php && sed -i "s//" /var/www/dvs/index.php && cp /var/www/dvs/index.php /opt/index-dvs.txt -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dvs)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dvs)" sed -i "s/www\/html/www\/dvs/g" /usr/local/sbin/update-config.sh sed -i "s/www\/html/www\/dvs/g" /var/lib/dpkg/info/dvswitch* # diff --git a/menu/menu-asl b/menu/menu-asl index cf8f88f..35b2816 100644 --- a/menu/menu-asl +++ b/menu/menu-asl @@ -1,5 +1,5 @@ #!/bin/bash -sudo cat > /bin/menu-asl <<- "EOF" +cat > /bin/menu-asl <<- "EOF" #!/bin/bash if [[ $EUID -ne 0 ]]; then whiptail --title "root" --msgbox "Cambie a usuario root / Change to user root" 0 50 @@ -41,7 +41,7 @@ esac done exit 0 EOF -sudo cat > /bin/menu-asle <<- "EOF" +cat > /bin/menu-asle <<- "EOF" #!/bin/bash if [[ $EUID -ne 0 ]]; then whiptail --title "root" --msgbox "Cambie a usuario root / Change to user root" 0 50 @@ -148,7 +148,7 @@ case $choix in rm /etc/asterisk/* -r > output.log 2>&1 wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF" -O /etc/asterisk/asl-wizard.zip && rm -rf /tmp/cookies.txt && unzip /etc/asterisk/asl-wizard.zip -d /etc/asterisk/ -sudo cat > /var/www/html/allmon2/allmon.ini.php <<- "EOFX" +cat > /var/www/html/allmon2/allmon.ini.php <<- "EOFX" output.log 2>&1 wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1qBsyd47X_lLc4nOOXLwmb9ojJi0YrqgF" -O /etc/asterisk/asl-wizard.zip && rm -rf /tmp/cookies.txt && unzip /etc/asterisk/asl-wizard.zip -d /etc/asterisk/ if [ -d "/var/www/html/allmon2" ]; then -sudo cat > /var/www/html/allmon2/allmon.ini.php <<- "EOFX" +cat > /var/www/html/allmon2/allmon.ini.php <<- "EOFX" /bin/menu-aslb <<- "EOF" +cat > /bin/menu-aslb <<- "EOF" #!/bin/bash if [[ $EUID -ne 0 ]]; then whiptail --title "root" --msgbox "Cambie a usuario root / Change to user root" 0 50 @@ -304,8 +304,8 @@ servicios=("mmdvm_bridge99.service" "analog_bridge99.service" "md380-emu99.servi for servicio in "${servicios[@]}"; do if systemctl status "$servicio" | grep "service; enabled;" >/dev/null 2>&1; then echo "stop $servicio" - sudo systemctl disable "$servicio" - sudo systemctl stop "$servicio" + systemctl disable "$servicio" + systemctl stop "$servicio" fi done mcall="" @@ -376,21 +376,21 @@ done sopti=$(cat /tmp/sopti.txt) # Modify the MMDVM_Bridge.ini file for DMR - sudo sed -i "3s/Id=.*/Id=${mid}${did}/" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "69s/Enable=.*/Enable=1/" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "84s/Enable=.*/Enable=0/" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "44s/Enable=.*/Enable=1/" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "50s/Enable=.*/Enable=0/" /opt/user99/MMDVM_Bridge.ini + sed -i "3s/Id=.*/Id=${mid}${did}/" /opt/user99/MMDVM_Bridge.ini + sed -i "69s/Enable=.*/Enable=1/" /opt/user99/MMDVM_Bridge.ini + sed -i "84s/Enable=.*/Enable=0/" /opt/user99/MMDVM_Bridge.ini + sed -i "44s/Enable=.*/Enable=1/" /opt/user99/MMDVM_Bridge.ini + sed -i "50s/Enable=.*/Enable=0/" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "s/gatewayDmrId =.*/gatewayDmrId = ${mid}/g" /opt/user99/Analog_Bridge.ini - sudo sed -i "s/repeaterID =.*/repeaterID = ${mid}${did}/" /opt/user99/Analog_Bridge.ini - sudo sed -i "s/txTg =.*/txTg = ${txtg}/g" /opt/user99/Analog_Bridge.ini + sed -i "s/gatewayDmrId =.*/gatewayDmrId = ${mid}/g" /opt/user99/Analog_Bridge.ini + sed -i "s/repeaterID =.*/repeaterID = ${mid}${did}/" /opt/user99/Analog_Bridge.ini + sed -i "s/txTg =.*/txTg = ${txtg}/g" /opt/user99/Analog_Bridge.ini - sudo sed -i "2s/Callsign=.*/Callsign=$mcall/g" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "70s/Address=.*/Address=$sbridge/g" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "71s/Port=.*/Port=$sport/g" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "74s/Password=.*/Password=$spass/g" /opt/user99/MMDVM_Bridge.ini - sudo sed -i "77s/Options=.*/Options=$sopti/g" /opt/user99/MMDVM_Bridge.ini + sed -i "2s/Callsign=.*/Callsign=$mcall/g" /opt/user99/MMDVM_Bridge.ini + sed -i "70s/Address=.*/Address=$sbridge/g" /opt/user99/MMDVM_Bridge.ini + sed -i "71s/Port=.*/Port=$sport/g" /opt/user99/MMDVM_Bridge.ini + sed -i "74s/Password=.*/Password=$spass/g" /opt/user99/MMDVM_Bridge.ini + sed -i "77s/Options=.*/Options=$sopti/g" /opt/user99/MMDVM_Bridge.ini rm -f /tmp/mcall.txt /tmp/mid.txt /tmp/sbridge.txt /tmp/sport.txt /tmp/sopti.txt /tmp/midg.txt /tmp/spass.txt /tmp/did.txt @@ -401,13 +401,13 @@ servicios=("mmdvm_bridge99.service" "analog_bridge99.service" "md380-emu99.servi for servicio in "${servicios[@]}"; do if systemctl status "$servicio" | grep "service; enabled;" >/dev/null 2>&1; then echo "restart $servicio" - sudo systemctl stop "$servicio" - sudo systemctl start "$servicio" + systemctl stop "$servicio" + systemctl start "$servicio" else echo "start $servicio" - sudo systemctl stop "$servicio" - sudo systemctl start "$servicio" - sudo systemctl enable "$servicio" + systemctl stop "$servicio" + systemctl start "$servicio" + systemctl enable "$servicio" fi done whiptail --title "Easy setup ASL-Bridge-DMR" --msgbox "Configuracion finalizada" 0 50 @@ -421,13 +421,13 @@ servicios=("mmdvm_bridge99.service" "analog_bridge99.service" "md380-emu99.servi for servicio in "${servicios[@]}"; do if systemctl status "$servicio" | grep "service; enabled;" >/dev/null 2>&1; then echo "restart $servicio" - sudo systemctl stop "$servicio" - sudo systemctl start "$servicio" + systemctl stop "$servicio" + systemctl start "$servicio" else echo "start $servicio" - sudo systemctl stop "$servicio" - sudo systemctl start "$servicio" - sudo systemctl enable "$servicio" + systemctl stop "$servicio" + systemctl start "$servicio" + systemctl enable "$servicio" fi done ;; @@ -439,13 +439,13 @@ servicios=("mmdvm_bridge99.service" "analog_bridge99.service" "md380-emu99.servi for servicio in "${servicios[@]}"; do if systemctl status "$servicio" | grep "service; enabled;" >/dev/null 2>&1; then echo "stop $servicio" - sudo systemctl disable "$servicio" - sudo systemctl stop "$servicio" + systemctl disable "$servicio" + systemctl stop "$servicio" fi done ;; 4) -sudo nano /opt/user99/MMDVM_Bridge.ini ;; +nano /opt/user99/MMDVM_Bridge.ini ;; 5) # Lista de servicios a reiniciar servicios=("mmdvm_bridge99.service" "analog_bridge99.service" "md380-emu99.service") @@ -454,8 +454,8 @@ servicios=("mmdvm_bridge99.service" "analog_bridge99.service" "md380-emu99.servi for servicio in "${servicios[@]}"; do if systemctl status "$servicio" | grep "service; enabled;" >/dev/null 2>&1; then echo "stop $servicio" - sudo systemctl disable "$servicio" - sudo systemctl stop "$servicio" + systemctl disable "$servicio" + systemctl stop "$servicio" fi done rm /opt/user99/ -r > output.log 2>&1 @@ -475,10 +475,10 @@ done exit 0 EOF ######### -sudo chmod +x /bin/menu-asl -sudo chmod +x /bin/menu-aslb -sudo chmod +x /bin/menu-asle +chmod +x /bin/menu-asl +chmod +x /bin/menu-aslb +chmod +x /bin/menu-asle ln -sf /bin/menu-aslb /bin/MENU-ASLB ln -sf /bin/menu-asle /bin/MENU-ASLE ln -sf /bin/menu-asl /bin/MENU-ASL -sudo chmod +x /bin/MENU* +chmod +x /bin/MENU* diff --git a/update.sh b/update.sh index 26af8d4..1f5cb9b 100644 --- a/update.sh +++ b/update.sh @@ -16,8 +16,8 @@ else fi case $choix in 1) - sudo bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/update-dash-dvs.sh)" - sudo bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dvs)" + sudo bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/install/update-dash-dvs.sh)" + sudo bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dvs)" ;; 2) clear @@ -67,7 +67,7 @@ else fi case $choix in 1) -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/DVSMU/-/raw/main/emq-dvsmu.sh)" ;; +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/DVSMU/-/raw/main/emq-dvsmu.sh)" ;; 2) if [ "$(cat /proc/cpuinfo | grep 'Raspberry')" != "" ]; then apt-get update @@ -77,8 +77,8 @@ else exit 0 fi;; 3) -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/service/service.sh)" && -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dvs)" ;; +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/service/service.sh)" && +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/menu-dvs)" ;; 4) break ;; @@ -88,7 +88,7 @@ exit 0 EOFY2 sudo chmod +x /bin/menu-update2 cd / -bash -c "$(curl -fsSL https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/data-mmdvm.sh)" +bash -c "$(curl -fsSLk https://gitlab.com/hp3icc/emq-TE1/-/raw/main/menu/data-mmdvm.sh)" # ########################################## End Update Files ############################################################## menu-update0