From f0bca5e4ba1b66728df3c1729011f509dabc1a63 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 8 Jun 2022 07:56:24 -0500 Subject: [PATCH 01/42] update --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index 6e21764..fddb291 100644 --- a/changelog +++ b/changelog @@ -10,6 +10,7 @@ version=3.2.4 fix issue #380 https://github.com/km4ack/pi-build/issues/380 fix issue #401 Gridtracker not downloading https://github.com/km4ack/pi-build/issues/401 fix hamrs not installing/updating - https://github.com/km4ack/pi-build/issues/404 + fix issue #408 https://github.com/km4ack/pi-build/issues/408 3.2.3 Add support for Pat Winlink in 64 bit OS Fix FLDIGI on 64 bit - https://github.com/km4ack/pi-build/issues/378 From bce3af9c91e29b9a3c83466c6da1041d4119b7ae Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 9 Jul 2022 08:51:24 -0500 Subject: [PATCH 02/42] update --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ce5f415..4f44a15 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +# Support this Project + +[![Patreon](https://www.dropbox.com/s/gr6k9j359b744tl/patreon-logo1.png?dl=1)](https://patreon.com/km4ack) [![Tip Jar](https://www.dropbox.com/s/tk4w0tery1ugrqz/tip-jar-1024x900.png?dl=1)](https://paypal.me/km4ack) + # Description Build-a-Pi will allow you to get up and running fast with a Raspberry Pi for ham radio. From 18c7fa62f53823c26b3cbd724d754be598585fba Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sat, 9 Jul 2022 08:52:52 -0500 Subject: [PATCH 03/42] update --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f44a15..7a6553a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Support this Project -[![Patreon](https://www.dropbox.com/s/gr6k9j359b744tl/patreon-logo1.png?dl=1)](https://patreon.com/km4ack) [![Tip Jar](https://www.dropbox.com/s/tk4w0tery1ugrqz/tip-jar-1024x900.png?dl=1)](https://paypal.me/km4ack) +[![Patreon](https://www.dropbox.com/s/gr6k9j359b744tl/patreon-logo1.png?dl=1)](https://patreon.com/km4ack) | [![Tip Jar](https://www.dropbox.com/s/tk4w0tery1ugrqz/tip-jar-1024x900.png?dl=1)](https://paypal.me/km4ack) # Description @@ -159,3 +159,8 @@ Graphic viewer to view/manage log files. #### Gparted Disk utility. + +# Support this Project + +[![Patreon](https://www.dropbox.com/s/gr6k9j359b744tl/patreon-logo1.png?dl=1)](https://patreon.com/km4ack) | [![Tip Jar](https://www.dropbox.com/s/tk4w0tery1ugrqz/tip-jar-1024x900.png?dl=1)](https://paypal.me/km4ack) + From 9dd5b309ef2dd5e5a17de1306f6bc2c875401c19 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 09:14:08 -0500 Subject: [PATCH 04/42] add VARA #394 --- build-a-pi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-a-pi b/build-a-pi index 152d93a..f038a00 100755 --- a/build-a-pi +++ b/build-a-pi @@ -239,6 +239,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "GPSUPDATE" "Tool to Manage GPS Devices" \ false "ARDOP" "Modem for HF" \ false "ARDOPGUI" "GUI for ARDOP" \ + false "VARA" "VARA Modem" \ false "HAMLIB" "Needed for Rig Control" \ false "DIREWOLF" "Software TNC" \ false "AX25" "Data Link Layer Protocol" \ @@ -252,7 +253,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then fi if [ ${BUT} = 3 ]; then - BASEAPPS=(HOTSPOT HSTOOLS GPS ARDOP ARDOPGUI HAMLIB DIREWOLF AX25 PULSE GPSUPDATE) + BASEAPPS=(HOTSPOT HSTOOLS GPS ARDOP ARDOPGUI VARA HAMLIB DIREWOLF AX25 PULSE GPSUPDATE) for i in "${BASEAPPS[@]}"; do echo "$i" >>${BASE} done From f4aa40e28d8d0628efdf21d61534f32d379b6c08 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 09:14:14 -0500 Subject: [PATCH 05/42] update --- changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index fddb291..fd669c3 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ -version=3.2.4 +version=3.3.0 + +3.3.0 Add VARA modem - https://github.com/km4ack/pi-build/issues/394 3.2.4 Update HotSpot Tools shortcut Change 1000 to UID in update script From 3a1717b0b1b0f7839406d0e63672d604f62e5413 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 09:14:48 -0500 Subject: [PATCH 06/42] add VARA #394 --- functions/base.function | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/functions/base.function b/functions/base.function index ed5b289..69881db 100644 --- a/functions/base.function +++ b/functions/base.function @@ -173,6 +173,16 @@ EOF echo "Port=8515" >>${FILE} } +################################ +# VARA +################################ +VARA() { + cd ${HOME}/Downloads || return + curl -O https://raw.githubusercontent.com/WheezyE/Winelink/main/install_winelink.sh && bash install_winelink.sh bap + rm ${HOME}/Downloads/install_winelink.sh +} + + ################################ # HAMLIB ################################ From b775e18c0281031e600e07dd8d8b44b6eae2743e Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 09:15:04 -0500 Subject: [PATCH 07/42] add VARA #394 --- update | 1 + 1 file changed, 1 insertion(+) diff --git a/update b/update index 9120efb..b7c5467 100755 --- a/update +++ b/update @@ -306,6 +306,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "GPSUPDATE" "${GPSUPDATE}" "Tool to Manage GPS Devices" \ false "ARDOP" "$ARDOP" "Mode for HF" \ false "ARDOPGUI" "$ARDOPGUI" "GUI for ARDOP" \ + false "VARA" "$ARDOPGUI" "VARA Modem" \ false "DIREWOLF" "$DIRE" "Software TNC" \ false "AX25" "$AX25" "Data Link Layer Protocol" \ false "PULSE" "$PULSE" "Sound server" \ From 092bfe4bd914df79e31829f1bed8d323828ce2ee Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 09:21:23 -0500 Subject: [PATCH 08/42] fix #414 --- conky/conky-7inch | 68 +++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/conky/conky-7inch b/conky/conky-7inch index 05e8835..8673ace 100644 --- a/conky/conky-7inch +++ b/conky/conky-7inch @@ -1,35 +1,38 @@ -background yes -use_xft yes -xftfont 123:size=6 -xftalpha 0.5 -update_interval 0.5 -total_run_times 0 -own_window yes -own_window_type normal -own_window_transparent yes -own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager -double_buffer yes -minimum_size 120 5 -maximum_width 200 -draw_shades no -draw_outline no -draw_borders no -draw_graph_borders no -default_color gray -default_shade_color red -default_outline_color green -alignment top_right -gap_x 5 -gap_y 10 -no_buffers yes -uppercase no -cpu_avg_samples 2 -net_avg_samples 1 -override_utf8_locale yes -use_spacer right -TEXT +conky.config = { + background = true, + use_xft = true, + font = '123:size=8', + xftalpha = 0.5, + update_interval = 0.5, + total_run_times = 0, + own_window = true, + own_window_type = 'normal', + own_window_transparent = true, + own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', + double_buffer = true, + minimum_width = 250, minimum_height = 5, + maximum_width = 400, + draw_shades = false, + draw_outline = false, + draw_borders = false, + draw_graph_borders = false, + default_color = 'gray', + default_shade_color = 'red', + default_outline_color = 'green', + alignment = 'top_right', + gap_x = 10, + gap_y = 10, + no_buffers = true, + uppercase = false, + cpu_avg_samples = 2, + net_avg_samples = 1, + override_utf8_locale = true, + use_spacer = 'right', +}; -${font Arial:size=12}${color Yellow}${alignc}N0CALL +conky.text = [[ + +${font Arial:size=12}${color Yellow}${alignc}KM4ACK-FIELD-PI ${voffset -30} ${font Arial:bold:size=08}${color White}Gridsquare ${alignr}${color Yellow}${execi 60 cat /run/user/1000/gridinfo.txt | cut -c1-8} #${font Arial:bold:size=12}${color White}Radio Freq ${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq | cut -c1-6} @@ -51,7 +54,7 @@ ${font Arial:bold:size=08}${color Yellow}SYSTEM ${color DarkSlateGray} ${hr 2} ${font Arial:bold:size=08}${color White}Frequency $alignr${freq_g cpu0}Ghz ${font Arial:bold:size=08}${color White}Uptime $alignr${uptime} #TEMP -${font Arial:bold:size=08}${color White}Temp: $alignr ${exec /usr/bin/vcgencmd measure_temp | awk -F "[=']" '{print($2 * 1.8)+32}'} F +${font Arial:bold:size=08}${color White}Temp: $alignr ${exec /usr/bin/vcgencmd measure_temp | cut -c6-9} C ${voffset -10} ${font Arial:bold:size=6}${color White}CPU${alignr}${cpu}% ${cpubar cpu} @@ -88,3 +91,4 @@ ${font Arial:bold:size=6}${color White}${tail ~/Documents/mylog.txt 5} #$diskio +]]; \ No newline at end of file From f62363e99e3b8ff3dc0c4ecb7a9581dfaadb2c5f Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 09:30:50 -0500 Subject: [PATCH 09/42] fix #413 --- functions/base.function | 3 +++ 1 file changed, 3 insertions(+) diff --git a/functions/base.function b/functions/base.function index 69881db..8322bfa 100644 --- a/functions/base.function +++ b/functions/base.function @@ -133,6 +133,9 @@ EOF # ARDOP ################################ ARDOP() { + if [ -f ${HOME}/ardop/piardopc; then + rm ${HOME}/ardop/piardopc + fi mkdir -p ${HOME}/ardop cd ${HOME}/ardop || return #determine if 64 bit and install correct dependencies. From 8de092d6fd0c55a268663dba6ee46befef4f2316 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 11:20:31 -0500 Subject: [PATCH 10/42] add repeaterSTART #400 --- app-check | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/app-check b/app-check index da5d1d6..10414b3 100644 --- a/app-check +++ b/app-check @@ -683,13 +683,27 @@ echo "Checking Packet Search" fi fi - #----------------------------------------------------# - # piQtSoundModem - #----------------------------------------------------# - if [ -f /usr/local/bin/piQtSoundModem ]; then - echo "QTSOUND=Installed" >> $UPDATEFILE - else - echo "QTSOUND=Not_Installed" >> $UPDATEFILE - fi +#----------------------------------------------------# +# piQtSoundModem +#----------------------------------------------------# +if [ -f /usr/local/bin/piQtSoundModem ]; then + echo "QTSOUND=Installed" >> $UPDATEFILE +else + echo "QTSOUND=Not_Installed" >> $UPDATEFILE +fi + +#----------------------------------------------------# +# Repeater-Start +#----------------------------------------------------# +echo "Checking Repeater-Start" +REPEAT_CURRENT_VER=$(dpkg --list | grep repeater-start | awk '{print $3}') +REPEAT_LATEST=$(curl -s https://sourceforge.net/projects/repeater-start/files/ | grep all.deb | head -1 | sed 's/.*repeater/repeater/;s/".*//') +REPEAT_LATEST_VER=$(echo $REPEAT_LATEST | sed 's/repeater-start_//;s/_.*//') + + if (($(echo "${REPEAT_LATEST_VER} ${REPEAT_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then + echo "REPEAT=NEEDS-UPDATE" >> $UPDATEFILE + else + echo "REPEAT=is_latest_version" >> $UPDATEFILE + fi CHECK \ No newline at end of file From 5a66ae5c32c8a76ab7378a55db9e28fdaaf9956f Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 11:20:38 -0500 Subject: [PATCH 11/42] add repeaterSTART #400 --- build-a-pi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-a-pi b/build-a-pi index f038a00..acade76 100755 --- a/build-a-pi +++ b/build-a-pi @@ -406,6 +406,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "GPREDICT" "Satellite Tracking" \ false "TQSL" "LOTW Software" \ false "GRIDCALC" "Grid Calculation Software" \ + false "REPEAT" "Repeater Directory" \ --button="Exit":1 \ --button="Check All and Continue":3 \ --button="Next":2 >${ADDITIONAL} @@ -417,7 +418,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) + GRIDCALC CQRLOG REPEAT) for i in "${ADDAPPS[@]}"; do echo "$i" >>${ADDITIONAL} From afbe8e625f89ab452ee25c301e3f14bfc13dbf27 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 11:20:47 -0500 Subject: [PATCH 12/42] add repeaterSTART #400 --- functions/additional.function | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/functions/additional.function b/functions/additional.function index 1b83dc3..991e6e1 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -891,6 +891,17 @@ GRIDCALC(){ $HOME/bin/grid-calc } +################################## +# Repeater-Start +################################## +REPEAT(){ +REPEAT_LATEST=$(curl -s https://sourceforge.net/projects/repeater-start/files/ | grep all.deb | head -1 | sed 's/.*repeater/repeater/;s/".*//') +cd ${HOME}/Downloads +wget https://sourceforge.net/projects/repeater-start/files/$REPEAT_LATEST +sudo dpkg -i $REPEAT_LATEST +} + + ################################## # JTDX ################################## @@ -912,4 +923,6 @@ JTDX() { sudo apt-get --fix-broken -y install sudo dpkg -i ${VER} rm ${VER} + + } From 399a54c81fb092c334dbf2c8d555be6dd17bb2bd Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 11:20:54 -0500 Subject: [PATCH 13/42] add repeaterSTART #400 --- update | 1 + 1 file changed, 1 insertion(+) diff --git a/update b/update index b7c5467..02c4a32 100755 --- a/update +++ b/update @@ -451,6 +451,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "CONKY" "$CONKY" "System Information Display" \ false "WSJTX" "$FT8" "Weak signal digital mode software" \ false "JS8CALL" "$JS8" "Weak signal digital mode software" \ + false "REPEATL" "$REPEAT" "Repeater Directory" \ false "XASTIR" "$XASTIR" "APRS Client" \ false "YAAC" "$YAAC" "Yet Another APRS Client" \ false "PI-APRS" "$PIAPRS" "APRS Messaging Client" \ From 4d0bd8b6c16d9053d7c67693d6f05c4802d43293 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 11:24:01 -0500 Subject: [PATCH 14/42] fix typo --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index 02c4a32..06e39ef 100755 --- a/update +++ b/update @@ -451,7 +451,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "CONKY" "$CONKY" "System Information Display" \ false "WSJTX" "$FT8" "Weak signal digital mode software" \ false "JS8CALL" "$JS8" "Weak signal digital mode software" \ - false "REPEATL" "$REPEAT" "Repeater Directory" \ + false "REPEAT" "$REPEAT" "Repeater Directory" \ false "XASTIR" "$XASTIR" "APRS Client" \ false "YAAC" "$YAAC" "Yet Another APRS Client" \ false "PI-APRS" "$PIAPRS" "APRS Messaging Client" \ From 31d68055e9a0370b33a587d7a5bd5acbe24f44fc Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 11:53:42 -0500 Subject: [PATCH 15/42] add VARA check --- app-check | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app-check b/app-check index 10414b3..bb6bcc5 100644 --- a/app-check +++ b/app-check @@ -65,6 +65,15 @@ CHECK() { echo "ARDOPGUI=Not_Installed" >> $UPDATEFILE fi #----------------------------------------------------# + # VARA + #----------------------------------------------------# + echo "Checking VARA" + if [ -f /home/pi/.wine/drive_c/VARA/VARA.exe ]; then + echo "VARA=Installed" >> $UPDATEFILE + else + echo "VARA=Not_Installed" >> $UPDATEFILE + fi + #----------------------------------------------------# # JS8Call #----------------------------------------------------# if ! hash js8call 2>/dev/null; then From 9f56d8a3a397c74d87baa5356171a3cba67d6eb5 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 11:54:48 -0500 Subject: [PATCH 16/42] fix VARA variable --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index 06e39ef..93d2db9 100755 --- a/update +++ b/update @@ -306,7 +306,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "GPSUPDATE" "${GPSUPDATE}" "Tool to Manage GPS Devices" \ false "ARDOP" "$ARDOP" "Mode for HF" \ false "ARDOPGUI" "$ARDOPGUI" "GUI for ARDOP" \ - false "VARA" "$ARDOPGUI" "VARA Modem" \ + false "VARA" "$VARA" "VARA Modem" \ false "DIREWOLF" "$DIRE" "Software TNC" \ false "AX25" "$AX25" "Data Link Layer Protocol" \ false "PULSE" "$PULSE" "Sound server" \ From d969bd9cca15a6f92e0fda16e76992e09176da72 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 26 Aug 2022 12:36:37 -0500 Subject: [PATCH 17/42] update chirp download --- functions/additional.function | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/functions/additional.function b/functions/additional.function index 991e6e1..5afd822 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -399,7 +399,27 @@ sudo make install ################################## CHIRP() { -sudo apt install -y chirp + #sudo apt install -y chirp + cd ${DIR} || return + CHIRP_FILE=$(curl -s https://github.com/goldstar611/chirp-appimage/releases | grep armhf | head -1 | sed 's/.*"\///;s/".*//') + LINK="https://github.com/$CHIRP_FILE" + wget $LINK + CHIRP=$(ls | grep -i chirp) + sudo mv $CHIRP /usr/local/bin/chirp + +cat >chirp.desktop < Date: Fri, 26 Aug 2022 12:41:46 -0500 Subject: [PATCH 18/42] update chirp install --- functions/additional.function | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/additional.function b/functions/additional.function index 5afd822..3c18dfe 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -406,6 +406,7 @@ CHIRP() { wget $LINK CHIRP=$(ls | grep -i chirp) sudo mv $CHIRP /usr/local/bin/chirp + sudo chmod +x /usr/local/bin/chirp cat >chirp.desktop < Date: Fri, 26 Aug 2022 19:20:36 -0500 Subject: [PATCH 19/42] add repeater start depends --- functions/additional.function | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/additional.function b/functions/additional.function index 3c18dfe..6e30fb1 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -916,6 +916,7 @@ GRIDCALC(){ # Repeater-Start ################################## REPEAT(){ +sudo apt install -y gir1.2-osmgpsmap-1.0 gir1.2-geoclue-2.0 libosmgpsmap-1.0-1 REPEAT_LATEST=$(curl -s https://sourceforge.net/projects/repeater-start/files/ | grep all.deb | head -1 | sed 's/.*repeater/repeater/;s/".*//') cd ${HOME}/Downloads wget https://sourceforge.net/projects/repeater-start/files/$REPEAT_LATEST From 1fb7e5f06295b84e997dbc295680162fe50875ba Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 31 Aug 2022 17:35:34 -0500 Subject: [PATCH 20/42] fix #393 --- menu-update | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/menu-update b/menu-update index 29fe1cc..d78bca8 100644 --- a/menu-update +++ b/menu-update @@ -9,7 +9,7 @@ #km4ack - km4ack subcategory -REV=20210411 +REV=20220829 source $HOME/.config/KM4ACK @@ -60,11 +60,42 @@ sudo sed -i "s/Categories.*/Categories=$CATEGORY/" $FLPATH/flrig.desktop fi } +VARA(){ +########################## +# VARA +########################## +echo "updating VARA shortcuts" +if [ -f /usr/share/applications/vara-chat.desktop ]; then +sudo sed -i 's/Categories.*/Categories=vara/' /usr/share/applications/vara-chat.desktop +fi + +if [ -f /usr/share/applications/vara.desktop ]; then +sudo sed -i 's/Categories.*/Categories=vara/' /usr/share/applications/vara.desktop +fi + +if [ -f /usr/share/applications/vara-fm.desktop ]; then +sudo sed -i 's/Categories.*/Categories=vara/' /usr/share/applications/vara-fm.desktop +fi + +if [ -f /usr/share/applications/vara-sat.desktop ]; then +sudo sed -i 's/Categories.*/Categories=vara/' /usr/share/applications/vara-sat.desktop +fi + +if [ -f /usr/share/applications/vara-soundcardsetup.desktop ]; then +sudo sed -i 's/Categories.*/Categories=vara/' /usr/share/applications/vara-soundcardsetup.desktop +fi + +if [ -f /usr/share/applications/vara-update.desktopp ]; then +sudo sed -i 's/Categories.*/Categories=vara/' /usr/share/applications/vara-update.desktop +fi + +} + BAP(){ ########################## # BAP ########################## - +echo "Updating Build a Pi Shortcuts" cd /run/user/$UID #DONATE @@ -141,15 +172,15 @@ EOF sudo mv FLsuite.directory /usr/share/desktop-directories/ -cat >km4ack.directory <vara.directory <bap.directory <hamradio.menu < - KM4ACK - km4ack.directory + VARA + vara.directory - km4ack + vara @@ -220,6 +251,7 @@ else echo "MENU=$REV" >> $HOME/.config/KM4ACK CREATEMENU FLSUITE +VARA fi From 3d98f8fd3f3d286718f6bea302cc03d8d88cbb90 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 16 Sep 2022 08:06:52 -0500 Subject: [PATCH 21/42] fix typo --- menu-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu-update b/menu-update index d78bca8..878610e 100644 --- a/menu-update +++ b/menu-update @@ -85,7 +85,7 @@ if [ -f /usr/share/applications/vara-soundcardsetup.desktop ]; then sudo sed -i 's/Categories.*/Categories=vara/' /usr/share/applications/vara-soundcardsetup.desktop fi -if [ -f /usr/share/applications/vara-update.desktopp ]; then +if [ -f /usr/share/applications/vara-update.desktop ]; then sudo sed -i 's/Categories.*/Categories=vara/' /usr/share/applications/vara-update.desktop fi From 6b814e12fd239783e251946b794870d97a0bdde2 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 22 Sep 2022 11:23:02 -0500 Subject: [PATCH 22/42] fix #424 --- functions/additional.function | 66 +++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/functions/additional.function b/functions/additional.function index 6e30fb1..4422608 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -26,34 +26,16 @@ PAT() { fi if [ `getconf LONG_BIT` = '64' ]; then - - #reference: - #https://www.jeremymorgan.com/tutorials/raspberry-pi/install-go-raspberry-pi/ - #https://github.com/la5nta/pat/wiki/Building-from-source - #https://cqdeks4td.blogspot.com/2021/11/installing-pat-open-source-winlink.html - - #install golang needed for pat build - cd - wget https://go.dev/dl/go1.17.7.linux-arm64.tar.gz - sudo tar -C /usr/local -xzf go1.17.7.linux-arm64.tar.gz - rm go1.17.7.linux-arm64.tar.gz - - echo "PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile - echo "GOPATH=$HOME/go" >> $HOME/.profile - - source $HOME/.profile - - #download/build latest pat - cd - git clone https://github.com/la5nta/pat - cd pat - ./make.bash libax25 - ./make.bash - - sudo cp $HOME/pat/debian/pat@.service /lib/systemd/system/ - sudo cp $HOME/pat/pat /usr/bin/ - rm -rf $HOME/pat + #install deb file for 64 bit systems + NEWPATV=$(curl -s https://github.com/la5nta/pat/releases | grep arm64 | head -1 | sed 's/.*pat_/pat_/' | sed 's/<\/a>.*$//') + NEWPAT=$(echo ${NEWPATV} | sed 's/pat_//' | sed 's/_linux_arm64.deb//' | sed 's/0\.//') + echo "new pat v ${NEWPATV}" + echo "new pat ${NEWPAT}" + wget --tries 2 --connect-timeout=60 https://github.com/la5nta/pat/releases/download/v0.${NEWPAT}/${NEWPATV} + sudo dpkg -i ${DIR}/${NEWPATV} + else + #install deb file for 32 bit systems NEWPATV=$(curl -s https://github.com/la5nta/pat/releases | grep armhf | head -1 | sed 's/.*pat_/pat_/' | sed 's/<\/a>.*$//') NEWPAT=$(echo ${NEWPATV} | sed 's/pat_//' | sed 's/_linux_armhf.deb//' | sed 's/0\.//') @@ -100,6 +82,36 @@ PAT() { mv ${DIR}/config.json ${HOME}/.wl2k/ fi + PAT_OLD_SOURCE_INSTALL() { + #This code is left for reference. This was used ot build pat from source when 64bit Pi OS was first released. 20220922 + #reference: + #https://www.jeremymorgan.com/tutorials/raspberry-pi/install-go-raspberry-pi/ + #https://github.com/la5nta/pat/wiki/Building-from-source + #https://cqdeks4td.blogspot.com/2021/11/installing-pat-open-source-winlink.html + + #install golang needed for pat build + cd + wget https://go.dev/dl/go1.17.7.linux-arm64.tar.gz + sudo tar -C /usr/local -xzf go1.17.7.linux-arm64.tar.gz + rm go1.17.7.linux-arm64.tar.gz + + echo "PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile + echo "GOPATH=$HOME/go" >> $HOME/.profile + + source $HOME/.profile + + #download/build latest pat + cd + git clone https://github.com/la5nta/pat + cd pat + ./make.bash libax25 + ./make.bash + + sudo cp $HOME/pat/debian/pat@.service /lib/systemd/system/ + sudo cp $HOME/pat/pat /usr/bin/ + rm -rf $HOME/pat + } + } ################################## # PAT MENU From 58d03b66aefdbcc1ae92d4d1c6268b5f53812817 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Thu, 22 Sep 2022 11:25:51 -0500 Subject: [PATCH 23/42] update --- changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index fd669c3..08c655d 100644 --- a/changelog +++ b/changelog @@ -1,7 +1,11 @@ version=3.3.0 3.3.0 Add VARA modem - https://github.com/km4ack/pi-build/issues/394 - + fix conky 7 inch config - https://github.com/km4ack/pi-build/issues/414 + fix old ardop modem not removed - https://github.com/km4ack/pi-build/issues/413 + create VARA sub category - https://github.com/km4ack/pi-build/issues/393 + update chirp install - https://github.com/km4ack/pi-build/issues/337 + use 64bit package to install pat on 64bit OS - https://github.com/km4ack/pi-build/issues/424 3.2.4 Update HotSpot Tools shortcut Change 1000 to UID in update script Remove Pi username check From a39fe2b21644be694c68664646026940e3c28ab5 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sun, 2 Oct 2022 11:14:14 -0500 Subject: [PATCH 24/42] add pi 4 check for vara --- build-a-pi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/build-a-pi b/build-a-pi index acade76..8c45e45 100755 --- a/build-a-pi +++ b/build-a-pi @@ -259,6 +259,21 @@ if [ ${BUT} = 3 ]; then done fi +#If vARA is chosen, make sure we have a Pi 4 to work with. +#As of 02OCT2022 the VARA installer only works with the Pi 4. +VARA_CHK=$(grep VARA ${BASE}) +if [ -n $VARA_CHK ]; then + FREEMEM=$(free -m | grep Mem: | awk '{ print $2 }') + if [ $FREEMEM -lt 1900 ]; then + echo "Not enough memory available" + yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \ + --image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \ + --text="Not enough memory\rVARA requires a Pi 4.\r\rVARA will not be installed during the build." \ + --button=gtk-ok + sed -i 's/VARA//;/^$/d' ${BASE} + fi +fi + #check if hotspot is chosen for install & get info if needed HS=$(grep "HOTSPOT" ${BASE}) if [ -n "$HS" ]; then From 74a2db16820ce01093d69c257e48df4e6feb1f27 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Sun, 2 Oct 2022 11:14:28 -0500 Subject: [PATCH 25/42] add pi 4 check for vara --- update | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/update b/update index 93d2db9..b47bc3e 100755 --- a/update +++ b/update @@ -317,6 +317,21 @@ if [ ${BUT} = 1 ] || [ ${BUT} = 252 ]; then exit fi +#If vARA is chosen, make sure we have a Pi 4 to work with. +#As of 02OCT2022 the VARA installer only works with the Pi 4. +VARA_CHK=$(grep VARA ${BASE}) +if [ -n $VARA_CHK ]; then + FREEMEM=$(free -m | grep Mem: | awk '{ print $2 }') + if [ $FREEMEM -lt 1900 ]; then + echo "Not enough memory available" + yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \ + --image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \ + --text="Not enough memory\rVARA requires a Pi 4.\r\rVARA will not be installed during the build." \ + --button=gtk-ok + sed -i 's/VARA//;/^$/d' ${BASE} + fi +fi + ############################################################# #check if hotspot is chosen for install & get info if needed# ############################################################# From 4fe36594d0c0fc3b8c8d4be7e889ee38abc534e3 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Tue, 4 Oct 2022 10:28:22 -0500 Subject: [PATCH 26/42] fix callsign --- conky/conky-7inch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conky/conky-7inch b/conky/conky-7inch index 8673ace..e998f2f 100644 --- a/conky/conky-7inch +++ b/conky/conky-7inch @@ -32,7 +32,7 @@ conky.config = { conky.text = [[ -${font Arial:size=12}${color Yellow}${alignc}KM4ACK-FIELD-PI +${font Arial:size=12}${color Yellow}${alignc}N0CALL ${voffset -30} ${font Arial:bold:size=08}${color White}Gridsquare ${alignr}${color Yellow}${execi 60 cat /run/user/1000/gridinfo.txt | cut -c1-8} #${font Arial:bold:size=12}${color White}Radio Freq ${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq | cut -c1-6} From 3d2210561738be6c14cedd23e8ee6fcd76410438 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Tue, 4 Oct 2022 11:10:37 -0500 Subject: [PATCH 27/42] update chirp download --- functions/additional.function | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/additional.function b/functions/additional.function index 4422608..9c15685 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -413,10 +413,10 @@ CHIRP() { #sudo apt install -y chirp cd ${DIR} || return - CHIRP_FILE=$(curl -s https://github.com/goldstar611/chirp-appimage/releases | grep armhf | head -1 | sed 's/.*"\///;s/".*//') - LINK="https://github.com/$CHIRP_FILE" + CHIRPDATE=$(curl -s https://github.com/goldstar611/chirp-appimage | grep "releases/tag/" | sed 's|.*releases/tag/||;s|">||') + LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-armhf.AppImage" wget $LINK - CHIRP=$(ls | grep -i chirp) + CHIRP=$(ls | grep Chirp-daily) sudo mv $CHIRP /usr/local/bin/chirp sudo chmod +x /usr/local/bin/chirp From 21abc78b4f314837f98ba4ac0eb7f90b4f641882 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Tue, 4 Oct 2022 11:16:42 -0500 Subject: [PATCH 28/42] add chirp depends --- functions/additional.function | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/additional.function b/functions/additional.function index 9c15685..947de3e 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -413,6 +413,7 @@ CHIRP() { #sudo apt install -y chirp cd ${DIR} || return + sudo apt install libfuse2 CHIRPDATE=$(curl -s https://github.com/goldstar611/chirp-appimage | grep "releases/tag/" | sed 's|.*releases/tag/||;s|">||') LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-armhf.AppImage" wget $LINK From 92c72539b3b89bebef2de03b53839e52b421b305 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Tue, 4 Oct 2022 11:22:58 -0500 Subject: [PATCH 29/42] update --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index 08c655d..006b346 100644 --- a/changelog +++ b/changelog @@ -6,6 +6,7 @@ version=3.3.0 create VARA sub category - https://github.com/km4ack/pi-build/issues/393 update chirp install - https://github.com/km4ack/pi-build/issues/337 use 64bit package to install pat on 64bit OS - https://github.com/km4ack/pi-build/issues/424 + Add RepeaterStart - https://github.com/km4ack/pi-build/issues/400 3.2.4 Update HotSpot Tools shortcut Change 1000 to UID in update script Remove Pi username check From df502d10ae50e851fe4f91ca1d1a5e26c47732b2 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Tue, 4 Oct 2022 16:28:17 -0500 Subject: [PATCH 30/42] lower mem requirement for VARA --- build-a-pi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-a-pi b/build-a-pi index 8c45e45..12acbfd 100755 --- a/build-a-pi +++ b/build-a-pi @@ -264,7 +264,7 @@ fi VARA_CHK=$(grep VARA ${BASE}) if [ -n $VARA_CHK ]; then FREEMEM=$(free -m | grep Mem: | awk '{ print $2 }') - if [ $FREEMEM -lt 1900 ]; then + if [ $FREEMEM -lt 1500 ]; then echo "Not enough memory available" yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \ --image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \ From 92033be06a5263935a84639d958fb67cfdd69e4a Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Tue, 4 Oct 2022 16:28:32 -0500 Subject: [PATCH 31/42] lower mem requirement for VARA --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index b47bc3e..77bbba6 100755 --- a/update +++ b/update @@ -322,7 +322,7 @@ fi VARA_CHK=$(grep VARA ${BASE}) if [ -n $VARA_CHK ]; then FREEMEM=$(free -m | grep Mem: | awk '{ print $2 }') - if [ $FREEMEM -lt 1900 ]; then + if [ $FREEMEM -lt 1500 ]; then echo "Not enough memory available" yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \ --image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \ From e80167ab007ccada89fd6a7502c06202f7874861 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Wed, 5 Oct 2022 10:48:31 -0500 Subject: [PATCH 32/42] update pat install --- functions/additional.function | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/functions/additional.function b/functions/additional.function index 947de3e..02f2502 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -74,7 +74,10 @@ PAT() { #This is a secutiry risk. See https://github.com/km4ack/pi-build/issues/299 #Changed to 127.0.0.1 on 11OCT2021 KM4ACK sed -i "s/\"http_addr\": \".*\",/\"http_addr\": \"127.0.0.1:$PORT\",/" ${FIG} - jq '.ax25.rig = '\"my-rig\"'' ${FIG} | jq '.ardop.rig = '\"my-rig\"'' | jq '.hamlib_rigs = {'\"my-rig\"': {"address": "127.0.0.1:4532", "network": "tcp"}}' >~/Desktop/config.json + #jq '.ax25.rig = '\"my-rig\"'' ${FIG} | jq '.ardop.rig = '\"my-rig\"'' | jq '.hamlib_rigs = {'\"my-rig\"': {"address": "127.0.0.1:4532", "network": "tcp"}}' >~/Desktop/config.json + jq '.ax25.rig = '\"my-rig\"'' ${FIG} | jq '.varafm.rig = '\"my-rig\"'' | jq '.varahf.rig = '\"my-rig\"'' | jq '.ardop.rig = '\"my-rig\"'' | \ + jq '.varafm.ptt_ctrl = 'true'' | jq '.varahf.ptt_ctrl = 'true'' | \ + jq '.hamlib_rigs = {'\"my-rig\"': {"address": "127.0.0.1:4532", "network": "tcp"}}' >~/Desktop/config.json mv ${HOME}/Desktop/config.json ${FIG} sed -i 's/"enable_http": false,/"enable_http": true,/' ${FIG} From f00fc98deea5a5e9dcc4e29a53fe0cee53b7ddf1 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 7 Oct 2022 07:47:32 -0500 Subject: [PATCH 33/42] add 32 bit check for vara --- build-a-pi | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/build-a-pi b/build-a-pi index 12acbfd..f19cc4f 100755 --- a/build-a-pi +++ b/build-a-pi @@ -239,7 +239,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "GPSUPDATE" "Tool to Manage GPS Devices" \ false "ARDOP" "Modem for HF" \ false "ARDOPGUI" "GUI for ARDOP" \ - false "VARA" "VARA Modem" \ + false "VARA" "VARA Modem - Pi 4 32bit ONLY" \ false "HAMLIB" "Needed for Rig Control" \ false "DIREWOLF" "Software TNC" \ false "AX25" "Data Link Layer Protocol" \ @@ -259,7 +259,7 @@ if [ ${BUT} = 3 ]; then done fi -#If vARA is chosen, make sure we have a Pi 4 to work with. +#If vARA is chosen, make sure we have a Pi 4 32 bit system to work with. #As of 02OCT2022 the VARA installer only works with the Pi 4. VARA_CHK=$(grep VARA ${BASE}) if [ -n $VARA_CHK ]; then @@ -272,6 +272,16 @@ if [ -n $VARA_CHK ]; then --button=gtk-ok sed -i 's/VARA//;/^$/d' ${BASE} fi + + #check if 32 bit system + if [ `getconf LONG_BIT` != 32 ]; then + yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \ + --image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \ + --text="Not Compatible\rAt this time VARA is not compatible with 64bit OS. The devolper is working \ + to resolve this issue.\r\rVARA will not be installed during the build." \ + --button=gtk-ok + sed -i 's/VARA//;/^$/d' ${BASE} + fi fi #check if hotspot is chosen for install & get info if needed From 1f87d9fbcb735e02b879717221284ecad17f0d2e Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 7 Oct 2022 07:47:46 -0500 Subject: [PATCH 34/42] add 32 bit check for vara --- update | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/update b/update index 77bbba6..ffa5ac0 100755 --- a/update +++ b/update @@ -306,7 +306,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "GPSUPDATE" "${GPSUPDATE}" "Tool to Manage GPS Devices" \ false "ARDOP" "$ARDOP" "Mode for HF" \ false "ARDOPGUI" "$ARDOPGUI" "GUI for ARDOP" \ - false "VARA" "$VARA" "VARA Modem" \ + false "VARA" "$VARA" "VARA Modem - Pi 4 32bit ONLY" \ false "DIREWOLF" "$DIRE" "Software TNC" \ false "AX25" "$AX25" "Data Link Layer Protocol" \ false "PULSE" "$PULSE" "Sound server" \ @@ -330,6 +330,17 @@ if [ -n $VARA_CHK ]; then --button=gtk-ok sed -i 's/VARA//;/^$/d' ${BASE} fi + + #check if 32 bit system + if [ `getconf LONG_BIT` != 32 ]; then + yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \ + --image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \ + --text="Not Compatible\rAt this time VARA is not compatible with 64bit OS. The devolper is working \ + to resolve this issue.\r\rVARA will not be installed during the build." \ + --button=gtk-ok + sed -i 's/VARA//;/^$/d' ${BASE} + fi + fi ############################################################# From 66ab604831099c2a335f9a5d216e4b305cee9465 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 14 Oct 2022 08:33:57 -0500 Subject: [PATCH 35/42] remove vara 32bit limit --- build-a-pi | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/build-a-pi b/build-a-pi index f19cc4f..117fc1c 100755 --- a/build-a-pi +++ b/build-a-pi @@ -259,7 +259,7 @@ if [ ${BUT} = 3 ]; then done fi -#If vARA is chosen, make sure we have a Pi 4 32 bit system to work with. +#If VARA is chosen, make sure we have a Pi 4 32 bit system to work with. #As of 02OCT2022 the VARA installer only works with the Pi 4. VARA_CHK=$(grep VARA ${BASE}) if [ -n $VARA_CHK ]; then @@ -273,15 +273,6 @@ if [ -n $VARA_CHK ]; then sed -i 's/VARA//;/^$/d' ${BASE} fi - #check if 32 bit system - if [ `getconf LONG_BIT` != 32 ]; then - yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \ - --image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \ - --text="Not Compatible\rAt this time VARA is not compatible with 64bit OS. The devolper is working \ - to resolve this issue.\r\rVARA will not be installed during the build." \ - --button=gtk-ok - sed -i 's/VARA//;/^$/d' ${BASE} - fi fi #check if hotspot is chosen for install & get info if needed From f7e2624888e620daa31ac647320734b27ac1ec56 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 14 Oct 2022 08:34:11 -0500 Subject: [PATCH 36/42] remove vara 32bit limit --- update | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/update b/update index ffa5ac0..afdd41c 100755 --- a/update +++ b/update @@ -317,7 +317,7 @@ if [ ${BUT} = 1 ] || [ ${BUT} = 252 ]; then exit fi -#If vARA is chosen, make sure we have a Pi 4 to work with. +#If VARA is chosen, make sure we have a Pi 4 to work with. #As of 02OCT2022 the VARA installer only works with the Pi 4. VARA_CHK=$(grep VARA ${BASE}) if [ -n $VARA_CHK ]; then @@ -331,16 +331,6 @@ if [ -n $VARA_CHK ]; then sed -i 's/VARA//;/^$/d' ${BASE} fi - #check if 32 bit system - if [ `getconf LONG_BIT` != 32 ]; then - yad --form --width=500 --text-align=center --center --title="Build-a-Pi" --text-align=center \ - --image ${LOGO} --window-icon=${LOGO} --image-on-top --separator="|" --item-separator="|" \ - --text="Not Compatible\rAt this time VARA is not compatible with 64bit OS. The devolper is working \ - to resolve this issue.\r\rVARA will not be installed during the build." \ - --button=gtk-ok - sed -i 's/VARA//;/^$/d' ${BASE} - fi - fi ############################################################# From 844b64d168754450b9f7023f27d708166521e3a2 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 14 Oct 2022 10:50:54 -0500 Subject: [PATCH 37/42] update menu wording --- build-a-pi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-a-pi b/build-a-pi index 117fc1c..dd14382 100755 --- a/build-a-pi +++ b/build-a-pi @@ -239,7 +239,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "GPSUPDATE" "Tool to Manage GPS Devices" \ false "ARDOP" "Modem for HF" \ false "ARDOPGUI" "GUI for ARDOP" \ - false "VARA" "VARA Modem - Pi 4 32bit ONLY" \ + false "VARA" "VARA Modem - Pi 4 Required" \ false "HAMLIB" "Needed for Rig Control" \ false "DIREWOLF" "Software TNC" \ false "AX25" "Data Link Layer Protocol" \ From 53edfaca22eee2da7f2af00d510bf15334962783 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Fri, 14 Oct 2022 10:51:06 -0500 Subject: [PATCH 38/42] update menu wording --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index afdd41c..52bb8de 100755 --- a/update +++ b/update @@ -306,7 +306,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "GPSUPDATE" "${GPSUPDATE}" "Tool to Manage GPS Devices" \ false "ARDOP" "$ARDOP" "Mode for HF" \ false "ARDOPGUI" "$ARDOPGUI" "GUI for ARDOP" \ - false "VARA" "$VARA" "VARA Modem - Pi 4 32bit ONLY" \ + false "VARA" "$VARA" "VARA Modem - Pi 4 Required" \ false "DIREWOLF" "$DIRE" "Software TNC" \ false "AX25" "$AX25" "Data Link Layer Protocol" \ false "PULSE" "$PULSE" "Sound server" \ From fdbcc7d92a7e9e761238eed5f2dc96edeba069d8 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Mon, 17 Oct 2022 08:49:13 -0500 Subject: [PATCH 39/42] update --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index 006b346..5017f02 100644 --- a/changelog +++ b/changelog @@ -7,6 +7,7 @@ version=3.3.0 update chirp install - https://github.com/km4ack/pi-build/issues/337 use 64bit package to install pat on 64bit OS - https://github.com/km4ack/pi-build/issues/424 Add RepeaterStart - https://github.com/km4ack/pi-build/issues/400 + fix gridtracker download - https://github.com/km4ack/pi-build/issues/447 3.2.4 Update HotSpot Tools shortcut Change 1000 to UID in update script Remove Pi username check From 98a01e724dd836de16be260460d6fabd9706f80e Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Mon, 17 Oct 2022 08:49:35 -0500 Subject: [PATCH 40/42] fix #447 --- functions/additional.function | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/functions/additional.function b/functions/additional.function index 02f2502..9061ea9 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -510,27 +510,29 @@ EOF sudo mv qsstv.desktop /usr/share/applications/ } + ################################## # GRIDTRACKER ################################## GRIDTRACKER() { + #due to constant changes to GT website, get the download link from a file on KM4ACK github. + cd /run/user/$UID/ + wget https://raw.githubusercontent.com/km4ack/pi-scripts/master/gt-download-links cd ${HOME} || return sudo apt-get install -y libgconf-2-4 + #determine if 32/64 bit and set download link accordingly. issue #382 if [ `getconf LONG_BIT` = '32' ]; then - #GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm32 | sed 's/.*href="//;s/">.*//') - GRIDDLL=$(curl -s https://storage.googleapis.com/gt_download/ | awk 'BEGIN{FS=""; OFS="\n"} {$1=$1} 1' | grep arm32 | sed '/nwjs/d;/test/d' | head -1 | sed 's///;s/<\/Key>.*//') - GT_DIR=$(echo $GRIDDLL | sed 's|/.*||') - GRIDDLL=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/') + GRIDDLL=$(cat /run/user/$UID/gt-download-links | grep arm32 | sed 's/arm32=//') + GT_TAR_NAME=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/') + else - #GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm64 | sed 's/.*href="//;s/">.*//') - GRIDDLL=$(curl -s https://storage.googleapis.com/gt_download/ | awk 'BEGIN{FS=""; OFS="\n"} {$1=$1} 1' | grep arm32 | sed '/nwjs/d;/test/d' | head -1 | sed 's///;s/<\/Key>.*//') - GT_DIR=$(echo $GRIDDLL | sed 's|/.*||') - GRIDDLL=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/') + GRIDDLL=$(cat /run/user/$UID/gt-download-links | grep arm64 | sed 's/arm64=//') + GT_TAR_NAME=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/') fi - wget --tries 2 --connect-timeout=60 https://storage.googleapis.com/gt_download/$GT_DIR/$GRIDDLL - GRIDTAR=$(echo $GRIDDLL | sed 's/.*\///g') - tar -xzvf $GRIDTAR + + wget --tries 2 --connect-timeout=60 $GRIDDLL + tar -xzvf $GT_TAR_NAME rm GridTracker*.gz #determine if 32/64 bit and get correct directory name. if [ `getconf LONG_BIT` = '32' ]; then @@ -539,6 +541,8 @@ GRIDTRACKER() { OLDFOLDER=$(ls | grep GridTracker*-linux-arm64) fi mv "$OLDFOLDER" $HOME/GridTracker + + cat >gridtracker.desktop < Date: Mon, 17 Oct 2022 09:06:15 -0500 Subject: [PATCH 41/42] fix #448 --- build-a-pi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-a-pi b/build-a-pi index dd14382..77e332b 100755 --- a/build-a-pi +++ b/build-a-pi @@ -262,7 +262,7 @@ fi #If VARA is chosen, make sure we have a Pi 4 32 bit system to work with. #As of 02OCT2022 the VARA installer only works with the Pi 4. VARA_CHK=$(grep VARA ${BASE}) -if [ -n $VARA_CHK ]; then +if [ -n "$VARA_CHK" ]; then FREEMEM=$(free -m | grep Mem: | awk '{ print $2 }') if [ $FREEMEM -lt 1500 ]; then echo "Not enough memory available" From 3175e9d899b69ddbb6feaa874eb54bb6f1e46f53 Mon Sep 17 00:00:00 2001 From: KM4ACK Date: Mon, 17 Oct 2022 09:06:29 -0500 Subject: [PATCH 42/42] fix #448 --- update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update b/update index 52bb8de..cb80853 100755 --- a/update +++ b/update @@ -320,7 +320,7 @@ fi #If VARA is chosen, make sure we have a Pi 4 to work with. #As of 02OCT2022 the VARA installer only works with the Pi 4. VARA_CHK=$(grep VARA ${BASE}) -if [ -n $VARA_CHK ]; then +if [ -n "$VARA_CHK" ]; then FREEMEM=$(free -m | grep Mem: | awk '{ print $2 }') if [ $FREEMEM -lt 1500 ]; then echo "Not enough memory available"