From 28d7161fd08d404d65ad01ac0139419a92c0c273 Mon Sep 17 00:00:00 2001 From: Daniel Hallmark Date: Mon, 23 Jan 2023 16:12:15 -0600 Subject: [PATCH] Fixes for pulling wsjtx from sourceforge instead of princeton physics --- AmRRON-Setup-Script.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 8972295..dafd774 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1502,13 +1502,16 @@ if [[ ${WSJTXVER} == ${NEWWSJTX} ]]; then #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 - cd $USERDIR && wget -N https://physics.princeton.edu/pulsar/K1JT/wsjtx-${NEWWSJTX}.tgz +# cd $USERDIR && curl -sL https://sourceforge.net/projects/wsjt/files/wsjtx-${NEWWSJTX}/wsjtx-${NEWWSJTXr}.tgz/download -WSJTXPKG=$(curl -s https://physics.princeton.edu/pulsar/k1jt/wsjtx.html | grep .tgz | sed 's/.*="//;s/">.*$//' | head -1) -WSJTXDIR=$(echo $WSJTXPKG | sed 's/.tgz//') +#WSJTXPKG=$(curl -sL https://sourceforge.net/projects/wsjt/files/wsjtx-${NEWWSJTX} | grep .tgz | sed 's/.*="//;s/">.*$//' | head -1) +#WSJTXDIR=$(echo $WSJTXPKG | sed 's/.tgz//') +WSJTXPKG=wsjtx-${NEWWSJTX}.tgz +WSJTXDIR=wsjtx-${NEWWSJTX} - wget -P $USERDIR/ -N https://physics.princeton.edu/pulsar/k1jt/$WSJTXPKG || +# 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 && tar -xvf $USERDIR/$WSJTXPKG && rm $USERDIR/$WSJTXPKG ||