From ca7e89125b2c363b95cec434622fd8ed1aedf87c Mon Sep 17 00:00:00 2001 From: tb14 Date: Mon, 15 Jun 2026 22:14:17 -0500 Subject: [PATCH] more wsjtx fixes --- AmRRON-Setup-Script.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 336bb3d..787d1a8 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1659,7 +1659,7 @@ if [[ ${WSJTXVER} == ${NEWWSJTX} ]]; then -WSJTXPKG=wsjtx-${NEWWSJTX}-src.tar.gz +WSJTXPKG=wsjtx-${NEWWSJTX}-linux-x86_64.deb WSJTXBASEDIRVER=$(echo ${NEWWSJTX} | awk -F "-" '{print $1}') WSJTXDIR=wsjtx-${WSJTXBASEDIRVER} ### Testing @@ -1674,18 +1674,12 @@ echo $WSJTXDIR # { ERRCODE="Failed to download WSJTX"; errors; return; } cd $USERDIR && wget --tries 2 --connect-timeout=60 https://sourceforge.net/projects/wsjt/files/wsjtx-${NEWWSJTX}/$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; } - + { ERRCODE="Failed to download WSJTX"; errors; return; } + cd $USERDIR && sudo dpkg -i wsjtx-${NEWWSJTX}-linux-x86_64.deb || + { ERRCODE="Unable to install wsjtx package"; errors; return; } + fi }