From 0ced433eff0f09a26bb048e51c1649f4e6137629 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 18 Oct 2022 21:00:14 -0700 Subject: [PATCH 01/10] add drats to bap --- README.md | 3 +++ app-check | 9 +++++++++ build-a-pi | 3 ++- functions/additional.function | 29 +++++++++++++++++++++++++++++ update | 1 + 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a6553a..8dd8126 100644 --- a/README.md +++ b/README.md @@ -118,6 +118,9 @@ Software to program radios. https://chirp.danplanet.com #### XASTIR: GUI interface useful when configuring APRS nodes. https://sourceforge.net/projects/xastir/ +#### D-RATS: +D-RATS is a communications tool for D-STAR amateur radio low-speed data (DV mode) https://github.com/ham-radio-software/D-Rats + #### YAAC: Yet Another APRS Client GUI interface useful when configuring APRS nodes. https://www.ka2ddo.org/ka2ddo/YAAC.html diff --git a/app-check b/app-check index bb6bcc5..448b0e1 100644 --- a/app-check +++ b/app-check @@ -692,6 +692,15 @@ echo "Checking Packet Search" fi fi +#----------------------------------------------------# +# piQtSoundModem +#----------------------------------------------------# +if [ -f $HOME/D-Rats/d-rats.py; ]; then + echo "D-RATS=Installed" >> $UPDATEFILE +else + echo "D-RATS=Not_Installed" >> $UPDATEFILE +fi + #----------------------------------------------------# # piQtSoundModem #----------------------------------------------------# diff --git a/build-a-pi b/build-a-pi index 77e332b..9664eb0 100755 --- a/build-a-pi +++ b/build-a-pi @@ -421,6 +421,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "XASTIR" "APRS Client" \ false "GPREDICT" "Satellite Tracking" \ false "TQSL" "LOTW Software" \ + false "DRATS" "D-RATS tool for D-STAR" \ false "GRIDCALC" "Grid Calculation Software" \ false "REPEAT" "Repeater Directory" \ --button="Exit":1 \ @@ -434,7 +435,7 @@ fi if [ ${BUT} = 3 ]; then ADDAPPS=(CONKY PI-APRS CHIRP GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL - GRIDCALC CQRLOG REPEAT) + DRATS GRIDCALC CQRLOG REPEAT) for i in "${ADDAPPS[@]}"; do echo "$i" >>${ADDITIONAL} diff --git a/functions/additional.function b/functions/additional.function index 9061ea9..adec603 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -590,6 +590,35 @@ PROPAGATION() { ${BUILDDIR}/voacapl-0.7.2/makeitshfbc } +################################## +# D-RATS +################################## +DRATS() { + if [ -f ${HOME}/D-Rats/d-rats.py ] ; then + echo "updating D-rats" + cd ${HOME}/D-Rats/ + git pull + else + echo "installing D-rats" + cd$ {HOME}/ + git clone https://github.com/ham-radio-software/D-Rats + fi + + cat >d-rats.desktop <${ADDITIONAL} From b3a74f721bd2bae9d248634078e863c5e9dad0cc Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 18 Oct 2022 21:02:57 -0700 Subject: [PATCH 02/10] Update app-check --- app-check | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-check b/app-check index 448b0e1..f4b98fb 100644 --- a/app-check +++ b/app-check @@ -693,9 +693,9 @@ echo "Checking Packet Search" fi #----------------------------------------------------# -# piQtSoundModem +# D-RATS #----------------------------------------------------# -if [ -f $HOME/D-Rats/d-rats.py; ]; then +if [ -f $HOME/D-Rats/d-rats.py ]; then echo "D-RATS=Installed" >> $UPDATEFILE else echo "D-RATS=Not_Installed" >> $UPDATEFILE From 5fc9df1bf1e66cb0a868cbdc1037da25a52e7c6c Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 18 Oct 2022 21:05:31 -0700 Subject: [PATCH 03/10] Update update --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index 1a3d7a8..06677df 100755 --- a/update +++ b/update @@ -481,7 +481,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "EES" "$EES" "KM4ACK Emergency Email Server" \ false "GPREDICT" "$GPREDICT" "Satellite Tracking" \ false "TQSL" "$TQSL" "LOTW Software" \ - false "D-RATS" "$DRATS" "D-RATS tool for D-STAR" \ + false "DRATS" "$DRATS" "D-RATS tool for D-STAR" \ false "GRIDCALC" "$GRIDCALC" "Grid Calculation Software" \ --button="Exit":1 \ --button="Next":2 >${ADDITIONAL} From 591cc113749756a8ba2f760cef93d9f482431626 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 18 Oct 2022 21:13:05 -0700 Subject: [PATCH 04/10] fix desktop file --- functions/additional.function | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/additional.function b/functions/additional.function index adec603..e0afbe0 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -609,6 +609,7 @@ DRATS() { Name=D-RATS Comment=D-RATS is a communications tool for D-STAR Exec=${HOME}/D-Rats/d-rats.py +Path=${HOME}/D-Rats/ Terminal=false Type=Application Categories=Network;HamRadio From 20940e8aec0711e3764894a1801fcc79f213f382 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 18 Oct 2022 21:16:37 -0700 Subject: [PATCH 05/10] correct missing string --- functions/additional.function | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/additional.function b/functions/additional.function index e0afbe0..aa45c6e 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -600,7 +600,7 @@ DRATS() { git pull else echo "installing D-rats" - cd$ {HOME}/ + cd$ ${HOME}/ git clone https://github.com/ham-radio-software/D-Rats fi From 9a77ab2098e6320e284c1c7f2ad8a4025b6d79c6 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 18 Oct 2022 21:22:23 -0700 Subject: [PATCH 06/10] Update app-check --- app-check | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-check b/app-check index f4b98fb..c1a7d8e 100644 --- a/app-check +++ b/app-check @@ -693,12 +693,12 @@ echo "Checking Packet Search" fi #----------------------------------------------------# -# D-RATS +# DRATS #----------------------------------------------------# if [ -f $HOME/D-Rats/d-rats.py ]; then - echo "D-RATS=Installed" >> $UPDATEFILE + echo "DRATS=Installed" >> $UPDATEFILE else - echo "D-RATS=Not_Installed" >> $UPDATEFILE + echo "DRATS=Not_Installed" >> $UPDATEFILE fi #----------------------------------------------------# From 27a6c96128f86b6cc3b411fa63d36ff4285406e3 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 18 Oct 2022 21:24:13 -0700 Subject: [PATCH 07/10] correct typo wow I should sleep --- functions/additional.function | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/additional.function b/functions/additional.function index aa45c6e..27ec0ea 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -600,7 +600,7 @@ DRATS() { git pull else echo "installing D-rats" - cd$ ${HOME}/ + cd ${HOME}/ git clone https://github.com/ham-radio-software/D-Rats fi From d2277faf229da2ad37c6a9d5351bf220d2673021 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Wed, 19 Oct 2022 11:02:52 -0700 Subject: [PATCH 08/10] enhance app.check --- app-check | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app-check b/app-check index c1a7d8e..ff3ebf9 100644 --- a/app-check +++ b/app-check @@ -696,7 +696,16 @@ echo "Checking Packet Search" # DRATS #----------------------------------------------------# if [ -f $HOME/D-Rats/d-rats.py ]; then - echo "DRATS=Installed" >> $UPDATEFILE + + DRATVER=$($HOME/D-Rats/cat PKG-INFO | grep Version | tail -1 | sed 's/Version: //') + NEWDRATVER=$(curl -s https://raw.githubusercontent.com/ham-radio-software/D-Rats/master/PKG-INFO | grep Version | tail -1 | sed 's/Version: //') + + if (($(echo "${NEWDRATVER} ${DRATVER}" | awk '{print ($1 > $2)}'))); then + echo "DRATS=NEEDS-UPDATE" >> $UPDATEFILE + else + echo "DRATS=is_latest_version" >> $UPDATEFILE + fi + else echo "DRATS=Not_Installed" >> $UPDATEFILE fi From 779fd3b33c3b1ad30bc83cfb402a27f194eff3bc Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Wed, 19 Oct 2022 11:12:13 -0700 Subject: [PATCH 09/10] folder correction --- app-check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-check b/app-check index ff3ebf9..f140c08 100644 --- a/app-check +++ b/app-check @@ -697,7 +697,7 @@ echo "Checking Packet Search" #----------------------------------------------------# if [ -f $HOME/D-Rats/d-rats.py ]; then - DRATVER=$($HOME/D-Rats/cat PKG-INFO | grep Version | tail -1 | sed 's/Version: //') + DRATVER=$(cat $HOME/D-Rats/PKG-INFO | grep Version | tail -1 | sed 's/Version: //') NEWDRATVER=$(curl -s https://raw.githubusercontent.com/ham-radio-software/D-Rats/master/PKG-INFO | grep Version | tail -1 | sed 's/Version: //') if (($(echo "${NEWDRATVER} ${DRATVER}" | awk '{print ($1 > $2)}'))); then From 7ea2a339b0a2c9fea89a8001230c1fafd7b55a24 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Wed, 19 Oct 2022 11:16:41 -0700 Subject: [PATCH 10/10] fix location of block --- app-check | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/app-check b/app-check index f140c08..d98f40b 100644 --- a/app-check +++ b/app-check @@ -557,6 +557,23 @@ CHECK() { echo "JTDX=Installed" >> $UPDATEFILE fi + #----------------------------------------------------# + # DRATS + #----------------------------------------------------# + if [ -f $HOME/D-Rats/d-rats.py ]; then + + DRATVER=$(cat $HOME/D-Rats/PKG-INFO | grep Version | tail -1 | sed 's/Version: //') + NEWDRATVER=$(curl -s https://raw.githubusercontent.com/ham-radio-software/D-Rats/master/PKG-INFO | grep Version | tail -1 | sed 's/Version: //') + + if (($(echo "${NEWDRATVER} ${DRATVER}" | awk '{print ($1 > $2)}'))); then + echo "DRATS=NEEDS-UPDATE" >> $UPDATEFILE + else + echo "DRATS=is_latest_version" >> $UPDATEFILE + fi + else + echo "DRATS=Not_Installed" >> $UPDATEFILE + fi + } #----------------------------------------------------# @@ -692,24 +709,6 @@ echo "Checking Packet Search" fi fi -#----------------------------------------------------# -# DRATS -#----------------------------------------------------# -if [ -f $HOME/D-Rats/d-rats.py ]; then - - DRATVER=$(cat $HOME/D-Rats/PKG-INFO | grep Version | tail -1 | sed 's/Version: //') - NEWDRATVER=$(curl -s https://raw.githubusercontent.com/ham-radio-software/D-Rats/master/PKG-INFO | grep Version | tail -1 | sed 's/Version: //') - - if (($(echo "${NEWDRATVER} ${DRATVER}" | awk '{print ($1 > $2)}'))); then - echo "DRATS=NEEDS-UPDATE" >> $UPDATEFILE - else - echo "DRATS=is_latest_version" >> $UPDATEFILE - fi - -else - echo "DRATS=Not_Installed" >> $UPDATEFILE -fi - #----------------------------------------------------# # piQtSoundModem #----------------------------------------------------#