From 8697cae838bf9f8c0b75f2db3012ebc29f31d9f2 Mon Sep 17 00:00:00 2001 From: tb14 Date: Thu, 26 Jun 2025 20:02:05 -0500 Subject: [PATCH] ... --- AmRRON-Setup-Script.sh | 62 ++++-------------------------------------- 1 file changed, 5 insertions(+), 57 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index daa53fd..40e318b 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -590,12 +590,8 @@ if [[ $NEWARDOP == "" ]]; then fi -#NEWWSJTX=$(curl -s https://physics.princeton.edu/pulsar/K1JT/wsjtx.html | 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 -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 -oP 'WSJT-X [0-9]+\.[0-9]+\.[0-9]+' | tail -n 1 | awk '{print $2}') -#NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep .tgz | sed 's/.*js8call-/js8call-/;s/<.*$//' | sed 's/js8call-//;s/.tgz.*$//') +NEWWSJTX=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep -oP 'WSJT-X [0-9]+\.[0-9]+\.[0-9]+' | tail -n 1 | awk '{print $2}') + NEWJS8CALLVER=$(curl -s https://api.github.com/repos/js8call/js8call/releases/latest | grep '"tag_name"' | sed -E 's/.*"v?([^"]+)".*/\1/') echo "100% Complete" @@ -1809,52 +1805,7 @@ 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 -} function amrronforms_install() { @@ -3634,7 +3585,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "CHIRP" "Radio Programing Software" "${CHIRP}" "${NEWCHIRP}" \ 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. Builds 2.2.1-devel" "${JS8CALLVER}" "${NEWJS8CALLVER}" \ + false "JS8CALL" "JS8Call Weak Signal QSO program." "${JS8CALLVER}" "${NEWJS8CALLVER}" \ false "JS8CALL_2.2.0" "JS8Call Weak Signal QSO program. Stable v. 2.2.0" "${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" \ @@ -3645,7 +3596,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s rc=$? if [[ $rc == 2 ]]; then - radioArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX_STABLE JS8CALL_2.2.0 PULSE UBLOX FORMS COMMSTATONE) + radioArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL_2.2.0 PULSE UBLOX FORMS COMMSTATONE) for i in "${radioArray[@]}" do @@ -4217,7 +4168,7 @@ rc=$? mkdir -p $USERDIR fi CONKYSEL=STANDARD - easyArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX_STABLE JS8CALL_2.2.0 PULSE UBLOX FORMS MINICOM GTKTERM QTTERMTCP 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=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL_2.2.0 PULSE UBLOX FORMS MINICOM GTKTERM QTTERMTCP 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 @@ -4332,9 +4283,6 @@ cat /tmp/results | yad --text-info --center \ 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 ;;