diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh
index 86ce69c..3244079 100755
--- a/AmRRON-Setup-Script.sh
+++ b/AmRRON-Setup-Script.sh
@@ -574,6 +574,7 @@ fi
#NEWWSJTX=$(curl -sL https://sourceforge.net/projects/wsjt/files | grep -o "wsjtx-[0-9].[0-9].[0-9]*" | awk -F "-" '{print $2}' | head -n 1)
#NEWWSJTX=$(curl -sL https://sourceforge.net/projects/wsjt/files | grep "released" | awk -F "title=" '{print $2}' | awk -F "/" '{print $2}' | awk -F "wsjtx-" '{print $2}')
NEWWSJTX=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep "Candidate release" | awk -F "WSJT-X " '{print $2}' | awk -F "" '{print $1}')
+NEWWSJTX_STABLE=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep "Latest General Availability (GA) releases" | awk -F "WSJT-X " '{print $2}' | awk -F "" '{print $1}')
NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep .tgz | sed 's/.*js8call-/js8call-/;s/<.*$//' | sed 's/js8call-//;s/.tgz.*$//')
echo "100% Complete"
@@ -1762,6 +1763,54 @@ echo $WSJTXDIR
+fi
+}
+
+
+function wsjtx_stable_install() {
+
+ if [[ $NEWWSJTX_STABLE == "SERVER DOWN" ]]; then
+ echo "WSJTX server unresponsive or broken link." >> /tmp/failures
+ return
+ fi
+
+if [[ ${WSJTXVER} == ${NEWWSJTX_STABLE} ]]; then
+ echo "WSJTX is already at the most current GA 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
+
+
+
+WSJTXPKG=wsjtx-${NEWWSJTX_STABLE}.tgz
+WSJTXBASEDIRVER=$(echo ${NEWWSJTX_STABLE} | awk -F "-" '{print $1}')
+WSJTXDIR=wsjtx-${WSJTXBASEDIRVER}
+### Testing
+echo $WSJTXPKG
+echo $WSJTXBASEDIRVER
+echo $WSJTXDIR
+###
+
+# wget -P $USERDIR/ -N https://physics.princeton.edu/pulsar/k1jt/$WSJTXPKG ||
+
+# cd $USERDIR && curl -sL https://sourceforge.net/projects/$WSJTXDIR/$WSJTXPKG/download ||
+# { ERRCODE="Failed to download WSJTX"; errors; return; }
+
+ cd $USERDIR && wget --tries 2 --connect-timeout=60 https://sourceforge.net/projects/wsjt/files/$WSJTXPKG ||
+ { ERRCODE="Failed to download WSJTX"; errors; return; }
+
+ cd $USERDIR && tar -xvf $USERDIR/$WSJTXPKG && rm $USERDIR/$WSJTXPKG ||
+ { ERRCODE="Unable to extract WSJTX Source Code"; errors; return; }
+
+ cd $USERDIR/$WSJTXDIR
+
+ cmake . && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF && cmake --build . -- -j4 && sudo make install ||
+ { ERRCODE="Failed to build WSJTX."; errors; return; }
+
+
+
fi
}
@@ -3486,7 +3535,8 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s
false "FINDARDOP" "Program by KM4ACK to find ardop stations" "${FINDARDOPVER}" "Unable to determine" \
false "VOACAP" "VOACAP Propagation tool and python GUI." "${VOACAPLVER}" "${NEWVOACAPL}" \
false "CHIRP" "Radio Programing Software" "${CHIRP}" "${NEWCHIRP}" \
- false "WSJTX" "WSJTX Weak Signal QSO program" "${WSJTXVER}" "${NEWWSJTX}" \
+ false "WSJTX" "WSJTX Weak Signal QSO program Release Candidate" "${WSJTXVER}" "${NEWWSJTX}" \
+ false "WSJTX_STABLE" "WSJTX Weak Signal QSO program General Availability Release" "${WSJTXVER}" "${NEWWSJTX_STABLE}" \
false "JS8CALL" "JS8Call Weak Signal QSO program." "${JS8CALLVER}" "${NEWJS8CALLVER}" \
false "COMMSTATONE" "JS8Call mapping (Mint only)" "Unknown" "Unknown" \
false "PULSE" "Pulseaudio suite. Includes pulseaudio, pavucontrol, and pulseaudio-utils." "Unable to determine" "Unable to determine" \
@@ -3497,7 +3547,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s
rc=$?
if [[ $rc == 2 ]]; then
- radioArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP_2.2.14 FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL PULSE UBLOX FORMS COMMSTATONE)
+ radioArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP_2.2.14 FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX_STABLE JS8CALL PULSE UBLOX FORMS COMMSTATONE)
for i in "${radioArray[@]}"
do
@@ -4068,7 +4118,7 @@ rc=$?
mkdir -p $USERDIR
fi
CONKYSEL=STANDARD
- easyArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP_2.2.14 FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS COMMSTATONE)
+ easyArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP_2.2.14 FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX_STABLE JS8CALL PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS COMMSTATONE)
for i in "${easyArray[@]}"
do
@@ -4180,9 +4230,12 @@ cat /tmp/results | yad --text-info --center \
VARIM) echo "Updating VARIM"
varim_install
;;
- WSJTX) echo "WSJTX not currently supported"
+ WSJTX) echo "WSJTX newest Release Candidate"
wsjtx_install
;;
+ WSJTX_STABLE) echo "WSJTX General Availability Release"
+ wsjtx_stable_install
+ ;;
PULSE) echo "Installing pulseaudio suite"
pulse_audio_suite_install
;;