diff --git a/menu/menu-mmdvm b/menu/menu-mmdvm index 24eb348..40eccd8 100644 --- a/menu/menu-mmdvm +++ b/menu/menu-mmdvm @@ -13,10 +13,8 @@ choix=$(whiptail --title "Raspbian Proyect HP3ICC Menu MMDVMHost" --menu "Suba o 9 " Editar Puerto http " \ 10 " Editar HTML " \ 11 " Editar Dashboard " \ -12 " Dashboard Rooms: BM, europelink " \ -13 " Dashboard Rooms: BM, worldlink " \ -14 " Dashboard Rooms: FreeDMR, europelink " \ -15 " Dashboard Rooms: FreeDMR, worldlink " \ +12 " Dashboard TG Name FreeDMR " \ +13 " Dashboard TG Name Brandmeister " \ 16 " Menu Principal " 3>&1 1>&2 2>&3) exitstatus=$? #on recupere ce choix @@ -41,9 +39,9 @@ sh /usr/local/bin/rpt-on.sh && sudo systemctl stop dmrid-mmdvm.service && sudo s 6) sudo systemctl stop mmdvmh.service && sudo systemctl disable mmdvmh.service && systemctl stop ysf2dmrgw.service && sudo systemctl stop dmrgw.service && sudo systemctl stop dmrid-mmdvm.service && sudo systemctl disable dmrid-mmdvm.service && cronedit.sh '0 3 * * *' 'sh /opt/MMDVMHost/DMRIDUpdate.sh' remove && sudo rm /var/log/mmdvmh/MMDVMH.* ;; 7) -sudo systemctl restart logtailer-mmdvmh.service && sudo systemctl enable logtailer-mmdvmh.service && sudo systemctl restart http.server-mmdvmh.service && sudo systemctl enable http.server-mmdvmh.service ;; +sudo systemctl restart logtailer-mmdvmh.service && sudo systemctl enable logtailer-mmdvmh.service && sudo systemctl restart http.server-mmdvmh.service && sudo systemctl enable http.server-mmdvmh.service && cronedit.sh '* */24 * * *' 'sh /bin/tg-name.sh' add ;; 8) -sudo systemctl stop logtailer-mmdvmh.service && sudo systemctl disable logtailer-mmdvmh.service && sudo systemctl stop http.server-mmdvmh.service && sudo systemctl disable http.server-mmdvmh.service ;; +sudo systemctl stop logtailer-mmdvmh.service && sudo systemctl disable logtailer-mmdvmh.service && sudo systemctl stop http.server-mmdvmh.service && sudo systemctl disable http.server-mmdvmh.service && cronedit.sh '* */24 * * *' 'sh /bin/tg-name.sh' remove ;; 9) sudo nano /lib/systemd/system/http.server-mmdvmh.service && sudo systemctl daemon-reload ;; 10) @@ -51,9 +49,9 @@ sudo nano /opt/MMDVMHost-Websocketboard/html/index.html ;; 11) sudo nano /opt/MMDVMHost-Websocketboard/html/js/config.js ;; 12) -cd /opt/MMDVMHost-Websocketboard/html/data/ && wget https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/TG_List.csv && sudo rm *.csv* && wget https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/TG_List.csv ;; +cat /opt/tg-name-fdmr.txt >> /bin/tg-name.sh && sh /bin/tg-name.sh ;; 13) -cd /opt/MMDVMHost-Websocketboard/html/data/ && wget https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/TG_List-WL.csv && sudo rm *.csv* && wget https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/TG_List-WL.csv && sudo mv TG_List-WL.csv TG_List.csv;; +cat /opt/tg-name-bm.txt >> /bin/tg-name.sh && sh /bin/tg-name.sh ;; 14) cd /opt/MMDVMHost-Websocketboard/html/data/ && wget https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/FDMR-EURO.csv && sudo rm *.csv* && wget https://raw.githubusercontent.com/hp3icc/emq-TE1ws/main/FDMR-EURO.csv && sudo mv FDMR-EURO.csv TG_List.csv;; 15) @@ -65,4 +63,29 @@ done exit 0 EOF ####### +cat > /opt/tg-name-fdmr.txt <<- "EOF" +#!/bin/bash +############################################################################################################### +# FreeDMR List TG +############################################################################################################### +wget http://downloads.freedmr.uk/downloads/talkgroup_ids.csv -O /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +sed -i 's/^ */DMR,2,/' /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +sed -i 's/,/ /4' /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +echo "DMR,2,9990,Parrot TG9990" >> /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +EOF +cat > /opt/tg-name-bm.txt <<- "EOF" +#!/bin/bash +############################################################################################################### +# BrandMeister List TG +############################################################################################################### +wget http://www.pistar.uk/downloads/TGList_BM.txt -O /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +sed -i 's/;0;/,/' /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +sed -i 's/;/,/' /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +sed -i 's/^ */DMR,2,/' /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +sed -i 's/,/ /4' /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +echo "DMR,2,9990,Parrot TG9990" >> /opt/MMDVMHost-Websocketboard/html/data/TG_List.csv +EOF +################################################################################################################ +cat /opt/tg-name-fdmr.txt >> /bin/tg-name.sh +chmod +x /bin/tg-name.sh chmod +x /bin/menu-mmdvm