From 7de7cf0101c06acd98455ae72f15f490fd16b634 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 18 Oct 2022 23:29:53 -0700 Subject: [PATCH 1/5] add wfview wfserver to bap --- README.md | 3 +++ app-check | 18 +++++++++++++++ build-a-pi | 6 +++-- functions/additional.function | 41 +++++++++++++++++++++++++++++++++++ functions/base.function | 41 +++++++++++++++++++++++++++++++++++ update | 2 ++ 6 files changed, 109 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7a6553a..342ffc9 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,9 @@ Winlink client for Raspberry Pi https://getpat.io/ #### PATMENU: Menu for configuring Pat. Recommended if installing Pat. https://github.com/km4ack/patmenu +#### wfview & wfserver +wfview is a program developed by amateur radio enthusiasts to control modern Icom ham radios https://wfview.org + #### ARDOPC: HF modem for Pat. Recommended if installing Pat. https://www.cantab.net/users/john.wiseman/Documents/ARDOPC.html diff --git a/app-check b/app-check index bb6bcc5..7c03a53 100644 --- a/app-check +++ b/app-check @@ -701,6 +701,24 @@ else echo "QTSOUND=Not_Installed" >> $UPDATEFILE fi +#----------------------------------------------------# +# wfview +#----------------------------------------------------# +if [ -f /usr/local/bin/wfview ]; then + echo "WFVIEW=Installed" >> $UPDATEFILE +else + echo "WFVIEW=Not_Installed" >> $UPDATEFILE +fi + +#----------------------------------------------------# +# wfviewsvr +#----------------------------------------------------# +if [ -f /usr/local/bin/wfserver ]; then + echo "WFVIEWSVR=Installed" >> $UPDATEFILE +else + echo "WFVIEWSVR=Not_Installed" >> $UPDATEFILE +fi + #----------------------------------------------------# # Repeater-Start #----------------------------------------------------# diff --git a/build-a-pi b/build-a-pi index 77e332b..7853ee8 100755 --- a/build-a-pi +++ b/build-a-pi @@ -240,6 +240,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "ARDOP" "Modem for HF" \ false "ARDOPGUI" "GUI for ARDOP" \ false "VARA" "VARA Modem - Pi 4 Required" \ + false "WFVIEWSVR" "wfView server" \ false "HAMLIB" "Needed for Rig Control" \ false "DIREWOLF" "Software TNC" \ false "AX25" "Data Link Layer Protocol" \ @@ -253,7 +254,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then fi if [ ${BUT} = 3 ]; then - BASEAPPS=(HOTSPOT HSTOOLS GPS ARDOP ARDOPGUI VARA HAMLIB DIREWOLF AX25 PULSE GPSUPDATE) + BASEAPPS=(HOTSPOT HSTOOLS GPS ARDOP ARDOPGUI VARA WFVIEWSVR HAMLIB DIREWOLF AX25 PULSE GPSUPDATE) for i in "${BASEAPPS[@]}"; do echo "$i" >>${BASE} done @@ -403,6 +404,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "CONKY" "System Information Display" \ false "PI-APRS" "APRS Message Application" \ false "CHIRP" "Program Radios" \ + false "WFVIEW" "wfView for Icom radios" \ false "GARIM" "File Transfer Program" \ false "PAT" "Radio Email Application" \ false "PAT-MENU" "Control for Pat Winlink" \ @@ -432,7 +434,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then fi if [ ${BUT} = 3 ]; then - ADDAPPS=(CONKY PI-APRS CHIRP GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO + ADDAPPS=(CONKY PI-APRS CHIRP WFVIEW GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL GRIDCALC CQRLOG REPEAT) diff --git a/functions/additional.function b/functions/additional.function index 9061ea9..6aa5f4e 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -562,6 +562,47 @@ EOF } +################################ +# WFVIEW +################################ +WFVIEW() { + + sudo apt-get install -y libasound2-dev cmake build-essential libudev-dev qt5-qmake libqt5core5a + sudo apt-get -y install build-essential + sudo apt-get -y install qt5-qmake + sudo apt-get -y install libqt5core5a + sudo apt-get -y install qtbase5-dev + sudo apt-get -y install libqt5serialport5 libqt5serialport5-dev + sudo apt-get -y install libqt5multimedia5 + sudo apt-get -y install libqt5multimedia5-plugins + sudo apt-get -y install libqt5xml5 + sudo apt-get -y install qtmultimedia5-dev + sudo apt-get -y install libopus-dev + sudo apt-get -y install libeigen3-dev + sudo apt-get -y install libportaudio2 libportaudiocpp0 + sudo apt-get -y install portaudio19-dev + sudo apt-get -y install librtaudio-dev librtaudio6 + sudo apt-get -y install git + echo "Only one of the next two commands need to work." + sudo apt-get -y install libqcustomplot1.3 libqcustomplot-doc libqcustomplot-dev + sudo apt-get -y install libqcustomplot2.0 libqcustomplot-doc libqcustomplot-dev + + cd ${BUILDDIR} + rm -rf wfview + + git clone --depth 1 https://gitlab.com/eliggett/wfview.git + + cd ${BUILDDIR}/wfview || return + git submodule init + git submodule update + + mkdir build + cd build + qmake ../wfview.pro + make -j2 + sudo make install + +} ################################## # PROPAGATION diff --git a/functions/base.function b/functions/base.function index 8322bfa..a79f220 100644 --- a/functions/base.function +++ b/functions/base.function @@ -234,6 +234,47 @@ DIREWOLF() { } +################################ +# WFVIEWSVR +################################ +WFVIEWSVR() { + + sudo apt-get -y install build-essential + sudo apt-get -y install qt5-qmake + sudo apt-get -y install libqt5core5a + sudo apt-get -y install qtbase5-dev + sudo apt-get -y install libqt5serialport5 libqt5serialport5-dev + sudo apt-get -y install libqt5multimedia5 + sudo apt-get -y install libqt5multimedia5-plugins + sudo apt-get -y install libqt5xml5 + sudo apt-get -y install qtmultimedia5-dev + sudo apt-get -y install libopus-dev + sudo apt-get -y install libeigen3-dev + sudo apt-get -y install libportaudio2 libportaudiocpp0 + sudo apt-get -y install portaudio19-dev + sudo apt-get -y install librtaudio-dev librtaudio6 + sudo apt-get -y install git + echo "Only one of the next two commands need to work." + sudo apt-get -y install libqcustomplot1.3 libqcustomplot-doc libqcustomplot-dev + sudo apt-get -y install libqcustomplot2.0 libqcustomplot-doc libqcustomplot-dev + + cd ${BUILDDIR} || return + rm -rf wfserver + + git clone --depth 1 https://gitlab.com/eliggett/wfview.git ./wfserver + + cd ${BUILDDIR}/wfserver || return + git submodule init + git submodule update + + mkdir build + cd build + qmake ../wfserver.pro + make -j2 + sudo make install + +} + ################################ # AX25 ################################ diff --git a/update b/update index cb80853..baf9ffb 100755 --- a/update +++ b/update @@ -307,6 +307,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "ARDOP" "$ARDOP" "Mode for HF" \ false "ARDOPGUI" "$ARDOPGUI" "GUI for ARDOP" \ false "VARA" "$VARA" "VARA Modem - Pi 4 Required" \ + false "WFVIEWSVR" "$WFVIEWSVR" "wfView server" \ false "DIREWOLF" "$DIRE" "Software TNC" \ false "AX25" "$AX25" "Data Link Layer Protocol" \ false "PULSE" "$PULSE" "Sound server" \ @@ -462,6 +463,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "PAT" "$PAT" "Radio Email Application" \ false "PAT-MENU" "$PATMENU" "Control for Pat Winlink" \ false "CHIRP" "$CHIRP" "Program Radios" \ + false "WFVIEW" "$WFVIEW" "wfView Icom radio controller" \ false "GARIM" "$GARIM" "File Transfer Program " \ false "M0IAX" "$M0IAX" "Tools for JS8Call messages" \ false "CONKY" "$CONKY" "System Information Display" \ From 10af607bb28ecc673e694423bb03976d7e7b6bb4 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Wed, 19 Oct 2022 08:47:38 -0700 Subject: [PATCH 2/5] Revert "Merge branch 'dev' into wfview" This reverts commit e6294e816589ee4acb5cb9c848a5333da1be0405, reversing changes made to c97a80edc22404e1f474768d5dcf659dc4ef433d. --- README.md | 3 --- app-check | 23 ++--------------- build-a-pi | 2 +- changelog | 5 +--- functions/additional.function | 47 ++++++----------------------------- update | 1 - 6 files changed, 12 insertions(+), 69 deletions(-) mode change 100644 => 100755 build-a-pi diff --git a/README.md b/README.md index 2c7211c..342ffc9 100644 --- a/README.md +++ b/README.md @@ -99,9 +99,6 @@ Software TNC. In this setup, Direwolf is used for a 2M packet connection with Pa #### AX25: AX.25 tools for Direwolf & Pat. Recommended if installing Pat. -#### gARIM/vARIM: -ARIM means "Amateur Radio Instant Messaging" https://www.whitemesa.net/garim/garim.html and https://www.whitemesa.net/varim/varim.html using ARDROP or VARA modem - #### HAMLIB: Rig contol software. https://sourceforge.net/projects/hamlib/ diff --git a/app-check b/app-check index 3179704..7c03a53 100644 --- a/app-check +++ b/app-check @@ -341,23 +341,6 @@ CHECK() { fi fi - #----------------------------------------------------# - # VARIM - #----------------------------------------------------# - echo "Checking VARIM" - if ! hash varim 2>/dev/null; then - echo "VARIM=Not_Installed" >> $UPDATEFILE - else - VARIM=$(varim --version | head -n1 | awk -F ' ' '{print $2}') - NEWVARIM=$(curl -s https://www.whitemesa.net/varim/varim.html | grep -m 1 \ - "armv7l.tar.gz" | awk -F '-' '{print $2}') - if (($(echo "${NEWVARIM} ${VARIM}" | awk '{print ($1 > $2)}'))); then - echo "VARIM=NEEDS-UPDATE" >> $UPDATEFILE - else - echo "VARIM=is_latest_version" >> $UPDATEFILE - fi - fi - #----------------------------------------------------# # XASTIR #----------------------------------------------------# @@ -744,12 +727,10 @@ 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 [ -z "$REPEAT_CURRENT_VER" ]; then - echo "REPEAT=Not_Installed" >> $UPDATEFILE - elif (($(echo "${REPEAT_LATEST_VER} ${REPEAT_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then + 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 +CHECK \ No newline at end of file diff --git a/build-a-pi b/build-a-pi old mode 100644 new mode 100755 index c82b663..7853ee8 --- a/build-a-pi +++ b/build-a-pi @@ -434,7 +434,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then fi if [ ${BUT} = 3 ]; then - ADDAPPS=(CONKY PI-APRS CHIRP WFVIEW GARIM VARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO + ADDAPPS=(CONKY PI-APRS CHIRP WFVIEW GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL GRIDCALC CQRLOG REPEAT) diff --git a/changelog b/changelog index c69b1b4..5017f02 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,5 @@ -version=3.3.1 +version=3.3.0 -3.3.1 Fix Chirp not installing on 64bit OS - https://github.com/km4ack/pi-build/pull/452 - Fix QSSTV Install - https://github.com/km4ack/pi-build/issues/422 - Fix Repeat Start App Check - https://github.com/km4ack/pi-build/issues/450 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 diff --git a/functions/additional.function b/functions/additional.function index ca23d46..6aa5f4e 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -415,22 +415,10 @@ sudo make install 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|">||') - - #determine if 32/64 bit and set download link accordingly. issue #382 - if [ `getconf LONG_BIT` = '32' ]; then - LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-armhf.AppImage" - - else - - LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-aarch64.AppImage" - - fi - wget $LINK CHIRP=$(ls | grep Chirp-daily) sudo mv $CHIRP /usr/local/bin/chirp @@ -485,27 +473,6 @@ GARIM() { rm *.gz } - -################################ -# VARIM -################################## -VARIM() { - sudo apt-get install -y libfltk1.1-dev - sudo apt-get install -y libfltk1.3-dev - VPKG=$(curl -s https://www.whitemesa.net/varim/src/ | grep tar.gz | tail -1 | sed 's/^.*varim/varim/' | sed 's/tar.gz.*$/tar.gz/') - cd ${BUILDDIR} || return - wget --tries 2 --connect-timeout=60 https://www.whitemesa.net/varim/src/$VPKG - tar -xzvf $VPKG - DIRR=$(echo $VPKG | sed 's/.tar.gz//') - cd ${DIRR} || return - ./configure - make - sudo make install - sudo make clean - cd ${BUILDDIR} || return - rm *.gz -} - ################################## # QSSTV ################################## @@ -514,17 +481,19 @@ QSSTV() { cd ${BUILDDIR} || return - git clone https://github.com/ON4QZ/QSSTV - cd QSSTV/src || return - + TAR=$(curl -s http://users.telenet.be/on4qz/qsstv/downloads/ | grep tar.gz | sed 's/.*href="//' | sed 's/">.*$//' | tail -1) + wget --tries 2 --connect-timeout=60 http://users.telenet.be/on4qz/qsstv/downloads/$TAR + tar -xvzf $TAR + SSTVTAR=$(ls -d */ | grep qss) + cd $SSTVTAR || return qmake make sudo make install sudo make clean cd ${BUILDDIR} || return - - sudo mkdir -p /usr/local/share/pixmaps/ - sudo cp ${BUILDDIR}/QSSTV/src/icons/qsstv.png /usr/local/share/pixmaps/ + rm *.gz + mkdir -p /usr/local/share/pixmaps/ + sudo cp ${BUILDDIR}/${SSTVTAR}/icons/qsstv.png /usr/local/share/pixmaps/ cat >qsstv.desktop < Date: Wed, 19 Oct 2022 08:58:47 -0700 Subject: [PATCH 3/5] Revert "Revert "Merge branch 'dev' into wfview"" This reverts commit 10af607bb28ecc673e694423bb03976d7e7b6bb4. --- README.md | 3 +++ app-check | 23 +++++++++++++++-- build-a-pi | 2 +- changelog | 5 +++- functions/additional.function | 47 +++++++++++++++++++++++++++++------ update | 1 + 6 files changed, 69 insertions(+), 12 deletions(-) mode change 100755 => 100644 build-a-pi diff --git a/README.md b/README.md index 342ffc9..2c7211c 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,9 @@ Software TNC. In this setup, Direwolf is used for a 2M packet connection with Pa #### AX25: AX.25 tools for Direwolf & Pat. Recommended if installing Pat. +#### gARIM/vARIM: +ARIM means "Amateur Radio Instant Messaging" https://www.whitemesa.net/garim/garim.html and https://www.whitemesa.net/varim/varim.html using ARDROP or VARA modem + #### HAMLIB: Rig contol software. https://sourceforge.net/projects/hamlib/ diff --git a/app-check b/app-check index 7c03a53..3179704 100644 --- a/app-check +++ b/app-check @@ -341,6 +341,23 @@ CHECK() { fi fi + #----------------------------------------------------# + # VARIM + #----------------------------------------------------# + echo "Checking VARIM" + if ! hash varim 2>/dev/null; then + echo "VARIM=Not_Installed" >> $UPDATEFILE + else + VARIM=$(varim --version | head -n1 | awk -F ' ' '{print $2}') + NEWVARIM=$(curl -s https://www.whitemesa.net/varim/varim.html | grep -m 1 \ + "armv7l.tar.gz" | awk -F '-' '{print $2}') + if (($(echo "${NEWVARIM} ${VARIM}" | awk '{print ($1 > $2)}'))); then + echo "VARIM=NEEDS-UPDATE" >> $UPDATEFILE + else + echo "VARIM=is_latest_version" >> $UPDATEFILE + fi + fi + #----------------------------------------------------# # XASTIR #----------------------------------------------------# @@ -727,10 +744,12 @@ 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 + if [ -z "$REPEAT_CURRENT_VER" ]; then + echo "REPEAT=Not_Installed" >> $UPDATEFILE + elif (($(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 +CHECK diff --git a/build-a-pi b/build-a-pi old mode 100755 new mode 100644 index 7853ee8..c82b663 --- a/build-a-pi +++ b/build-a-pi @@ -434,7 +434,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then fi if [ ${BUT} = 3 ]; then - ADDAPPS=(CONKY PI-APRS CHIRP WFVIEW GARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO + ADDAPPS=(CONKY PI-APRS CHIRP WFVIEW GARIM VARIM PAT PAT-MENU JS8CALL M0IAX WSJTX PYQSO HAMRS EES QSSTV GRIDTRACKER HAMCLOCK PROPAGATION YAAC XASTIR GPREDICT TQSL GRIDCALC CQRLOG REPEAT) diff --git a/changelog b/changelog index 5017f02..c69b1b4 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,8 @@ -version=3.3.0 +version=3.3.1 +3.3.1 Fix Chirp not installing on 64bit OS - https://github.com/km4ack/pi-build/pull/452 + Fix QSSTV Install - https://github.com/km4ack/pi-build/issues/422 + Fix Repeat Start App Check - https://github.com/km4ack/pi-build/issues/450 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 diff --git a/functions/additional.function b/functions/additional.function index 6aa5f4e..ca23d46 100644 --- a/functions/additional.function +++ b/functions/additional.function @@ -415,10 +415,22 @@ sudo make install 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|">||') + + #determine if 32/64 bit and set download link accordingly. issue #382 + if [ `getconf LONG_BIT` = '32' ]; then + LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-armhf.AppImage" + + else + + LINK="https://github.com/goldstar611/chirp-appimage/releases/download/$CHIRPDATE/Chirp-daily-$CHIRPDATE-aarch64.AppImage" + + fi + wget $LINK CHIRP=$(ls | grep Chirp-daily) sudo mv $CHIRP /usr/local/bin/chirp @@ -473,6 +485,27 @@ GARIM() { rm *.gz } + +################################ +# VARIM +################################## +VARIM() { + sudo apt-get install -y libfltk1.1-dev + sudo apt-get install -y libfltk1.3-dev + VPKG=$(curl -s https://www.whitemesa.net/varim/src/ | grep tar.gz | tail -1 | sed 's/^.*varim/varim/' | sed 's/tar.gz.*$/tar.gz/') + cd ${BUILDDIR} || return + wget --tries 2 --connect-timeout=60 https://www.whitemesa.net/varim/src/$VPKG + tar -xzvf $VPKG + DIRR=$(echo $VPKG | sed 's/.tar.gz//') + cd ${DIRR} || return + ./configure + make + sudo make install + sudo make clean + cd ${BUILDDIR} || return + rm *.gz +} + ################################## # QSSTV ################################## @@ -481,19 +514,17 @@ QSSTV() { cd ${BUILDDIR} || return - TAR=$(curl -s http://users.telenet.be/on4qz/qsstv/downloads/ | grep tar.gz | sed 's/.*href="//' | sed 's/">.*$//' | tail -1) - wget --tries 2 --connect-timeout=60 http://users.telenet.be/on4qz/qsstv/downloads/$TAR - tar -xvzf $TAR - SSTVTAR=$(ls -d */ | grep qss) - cd $SSTVTAR || return + git clone https://github.com/ON4QZ/QSSTV + cd QSSTV/src || return + qmake make sudo make install sudo make clean cd ${BUILDDIR} || return - rm *.gz - mkdir -p /usr/local/share/pixmaps/ - sudo cp ${BUILDDIR}/${SSTVTAR}/icons/qsstv.png /usr/local/share/pixmaps/ + + sudo mkdir -p /usr/local/share/pixmaps/ + sudo cp ${BUILDDIR}/QSSTV/src/icons/qsstv.png /usr/local/share/pixmaps/ cat >qsstv.desktop < Date: Wed, 19 Oct 2022 09:55:32 -0700 Subject: [PATCH 4/5] add app-check --- app-check | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/app-check b/app-check index 3179704..1042198 100644 --- a/app-check +++ b/app-check @@ -722,18 +722,35 @@ fi # wfview #----------------------------------------------------# if [ -f /usr/local/bin/wfview ]; then - echo "WFVIEW=Installed" >> $UPDATEFILE + echo "Checking wfview" + WFVIEW_CURRENT_VER=$(wfview --version | grep version | sed 's/wfview version: //' | cut -c1-4) + WFVIEW_LATEST=$(curl -s https://gitlab.com/eliggett/wfview/-/raw/master/WHATSNEW | grep + | tail -n 1 | sed 's/+ //' | cut -c1-4) + + if (($(echo "${WFVIEW_LATEST} ${WFVIEW_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then + echo "WFVIEW=NEEDS-UPDATE" >> $UPDATEFILE + else + echo "WFVIEW=is_latest_version" >> $UPDATEFILE + fi + else echo "WFVIEW=Not_Installed" >> $UPDATEFILE fi - #----------------------------------------------------# # wfviewsvr #----------------------------------------------------# if [ -f /usr/local/bin/wfserver ]; then - echo "WFVIEWSVR=Installed" >> $UPDATEFILE + echo "Checking wfserver" + WFSERVER_CURRENT_VER=$(wfserver --version | grep version | sed 's/wfserver version: //' | cut -c1-4) + WFSERVER_LATEST=$(curl -s https://gitlab.com/eliggett/wfview/-/raw/master/WHATSNEW | grep + | tail -n 1 | sed 's/+ //' | cut -c1-4) + + if (($(echo "${WFSERVER_LATEST} ${WFSERVER_CURRENT_VER}" | awk '{print ($1 > $2)}'))); then + echo "WFSERVER=NEEDS-UPDATE" >> $UPDATEFILE + else + echo "WFSERVER=is_latest_version" >> $UPDATEFILE + fi + else - echo "WFVIEWSVR=Not_Installed" >> $UPDATEFILE + echo "WFSERVER=Not_Installed" >> $UPDATEFILE fi #----------------------------------------------------# From 159d24117f11d1887dabd2af4a9b159b9f4eb97b Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Wed, 19 Oct 2022 10:02:21 -0700 Subject: [PATCH 5/5] wfserver name fix --- build-a-pi | 6 +++--- functions/base.function | 4 ++-- update | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-a-pi b/build-a-pi index c82b663..f5e010a 100644 --- a/build-a-pi +++ b/build-a-pi @@ -240,7 +240,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "ARDOP" "Modem for HF" \ false "ARDOPGUI" "GUI for ARDOP" \ false "VARA" "VARA Modem - Pi 4 Required" \ - false "WFVIEWSVR" "wfView server" \ + false "WFSERVER" "wfserver for Icom Radios" \ false "HAMLIB" "Needed for Rig Control" \ false "DIREWOLF" "Software TNC" \ false "AX25" "Data Link Layer Protocol" \ @@ -254,7 +254,7 @@ if [ ${BUT} = 252 ] || [ ${BUT} = 1 ]; then fi if [ ${BUT} = 3 ]; then - BASEAPPS=(HOTSPOT HSTOOLS GPS ARDOP ARDOPGUI VARA WFVIEWSVR HAMLIB DIREWOLF AX25 PULSE GPSUPDATE) + BASEAPPS=(HOTSPOT HSTOOLS GPS ARDOP ARDOPGUI VARA WFSERVER HAMLIB DIREWOLF AX25 PULSE GPSUPDATE) for i in "${BASEAPPS[@]}"; do echo "$i" >>${BASE} done @@ -404,7 +404,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "CONKY" "System Information Display" \ false "PI-APRS" "APRS Message Application" \ false "CHIRP" "Program Radios" \ - false "WFVIEW" "wfView for Icom radios" \ + false "WFVIEW" "wfview controller for Icom radios" \ false "GARIM" "File Transfer Program" \ false "PAT" "Radio Email Application" \ false "PAT-MENU" "Control for Pat Winlink" \ diff --git a/functions/base.function b/functions/base.function index a79f220..bc3f1ec 100644 --- a/functions/base.function +++ b/functions/base.function @@ -235,9 +235,9 @@ DIREWOLF() { } ################################ -# WFVIEWSVR +# WFSERVER ################################ -WFVIEWSVR() { +WFSERVER() { sudo apt-get -y install build-essential sudo apt-get -y install qt5-qmake diff --git a/update b/update index 08cd749..08c465c 100755 --- a/update +++ b/update @@ -307,7 +307,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "ARDOP" "$ARDOP" "Mode for HF" \ false "ARDOPGUI" "$ARDOPGUI" "GUI for ARDOP" \ false "VARA" "$VARA" "VARA Modem - Pi 4 Required" \ - false "WFVIEWSVR" "$WFVIEWSVR" "wfView server" \ + false "WFSERVER" "$WFSERVER" "wfview server for Icom radios" \ false "DIREWOLF" "$DIRE" "Software TNC" \ false "AX25" "$AX25" "Data Link Layer Protocol" \ false "PULSE" "$PULSE" "Sound server" \ @@ -463,7 +463,7 @@ yad --center --list --checklist --width=600 --height=600 --separator="" \ false "PAT" "$PAT" "Radio Email Application" \ false "PAT-MENU" "$PATMENU" "Control for Pat Winlink" \ false "CHIRP" "$CHIRP" "Program Radios" \ - false "WFVIEW" "$WFVIEW" "wfView Icom radio controller" \ + false "WFVIEW" "$WFVIEW" "wfview Icom radio controller" \ false "GARIM" "$GARIM" "File Transfer Program " \ false "VARIM" "$VARIM" "Radio Chat VARA" \ false "M0IAX" "$M0IAX" "Tools for JS8Call messages" \