diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index e34320e..45d7473 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -256,7 +256,7 @@ if hash pfe 2>/dev/null; then fi if hash wsjtx 2>/dev/null; then - WSJTXVER="INSTALLED-v. Unknown" + WSJTXVER=$(wsjtx_app_version -v | awk -F ' ' '{print $2}') else WSJTXVER="NOT INSTALLED" fi @@ -1428,6 +1428,10 @@ function wsjtx_install() { return fi +if [[ ${WSJTXVER} == ${NEWWSJTX} ]]; then + echo "WSJTX is already at the most current version" + + else #install from source sudo apt install -y qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools libqt5multimedia5-plugins libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev portaudio19-dev cmake libgfortran5 @@ -1454,7 +1458,7 @@ WSJTXDIR=$(echo $WSJTXPKG | sed 's/.tgz//') if hash wsjtx 2>/dev/null; then sudo rm -r $USERDIR/$WSJTXDIR fi - +fi } diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index f39c075..978d86c 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -14,7 +14,8 @@ - Re-enabled VOACAP / WSJTX for testing - WSJTX from source - removed deps for voacap testing - + - WSJTX version check + # Version 0.7.0 - Working - Working updates for current release 2022-09-22 Raspios Bullseye 32bit - Changed gfortran3 dep to gfortran5 wsjtx