From 31b8ee0eeb2f077434c0fabd409395cb4b395f77 Mon Sep 17 00:00:00 2001 From: tb14 Date: Sun, 16 Oct 2022 15:19:30 -0500 Subject: [PATCH] Voacap / wsjtx tests --- AmRRON-Setup-Script.sh | 54 ++++++++++++++++++++++++---- changelogs/CHANGELOG-Setup-Script.md | 2 ++ 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index d829540..1629d7b 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1289,7 +1289,8 @@ function voacap_install() { { echo voacap_os >> /tmp/cleanup; return; } else - sudo apt-get -y install yelp python3-gi python3-gi-cairo rarian-compat gnome-doc-utils \ +# removed deps rarian-compat gnome-doc-utils for testing + sudo apt-get -y install yelp python3-gi python3-gi-cairo \ pkg-config python3-dateutil python3-mpltoolkits.basemap python3-cairocffi libgtk-3-dev gettext || { ERRCODE="Failed to get dependencies for VOACAPL pythonprop GUI"; errors; return; } @@ -1365,7 +1366,7 @@ if [[ ${CHIRP} == ${NEWCHIRP} ]]; then } -function wsjtx_install() { +function wsjtx_install_old() { if [[ $NEWWSJTX == "SERVER DOWN" ]]; then echo "WSJTX server unresponsive or broken link." >> /tmp/failures @@ -1375,10 +1376,9 @@ fi SYS=$"armhf" elif [[ $(uname -m) = x86_64 ]]; then SYS=$"amd64" - else - SYS=$"i386" - fi + fi + #Install from binary if [[ ${WSJTXVER} == ${NEWWSJTX} ]]; then echo "WSJTX is already at the most current version" @@ -1388,6 +1388,7 @@ fi if [[ $OSCN =~ (tara|tessa|tina|tricia|bionic|eoan|focal|cosmic|stretch|buster|ulyana|amber) ]]; then echo "Getting dependencies" + #libboost-atomic1.62.0 libboost-chrono1.62.0 libboost-date-time1.62.0 libboost-filesystem1.62.0 libboost-log1.62.0 libboost-log1.67.0 libboost-regex1.62.0 libboost-system1.62.0 libboost-thread1.62.0 sudo apt-get -y install libqt5multimedia5-plugins libqt5serialport5 libqt5printsupport5 \ libqt5sql5-sqlite libfftw3-single3 libgfortran5 || { ERRCODE="Failed to get dependencies for WSJTX"; errors; return; } @@ -1405,13 +1406,54 @@ fi else - echo wsjtxunsupported >> /tmp/cleanup + #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 + sudo apt install -y qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev portaudio19-dev cmake libgfortran5 + echo wsjtxunsupported >> /tmp/cleanup fi fi } + +function wsjtx_install() { + + if [[ $NEWWSJTXVER == "SERVER DOWN" ]]; then + echo "WSJTX server unresponsive or broken link." >> /tmp/failures + return + fi + + + #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 + + +WSJTXPKG=$(curl -s https://physics.princeton.edu/pulsar/k1jt/wsjtx.html | grep .tgz | sed 's/.*="//;s/">.*$//' | head -1) +WSJTXDIR=$(echo $WSJTXPKG | sed 's/.tgz//') + + wget -P $USERDIR/ -N https://physics.princeton.edu/pulsar/k1jt/$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 --build . -- -j4 && sudo make install || + { ERRCODE="Failed to build WSJTX."; errors; return; } + + +#Cleanup space from compiling +if hash wsjtx 2>/dev/null; then + sudo rm -r $USERDIR/$WSJTXDIR +fi + +} + + function amrronforms_install() { FORMSDIR=$HOME/.nbems/CUSTOM if [ ! -d $HOME/.nbems/CUSTOM ]; then diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 00c86ea..f39c075 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -12,6 +12,8 @@ - Security tools version checking fixes. - More version checking and added space cleanup after compiling Radio tools. - Re-enabled VOACAP / WSJTX for testing + - WSJTX from source + - removed deps for voacap testing # Version 0.7.0 - Working - Working updates for current release 2022-09-22 Raspios Bullseye 32bit