From 695a636f07d7f32960eb69ea6d13584a1a27882e Mon Sep 17 00:00:00 2001 From: tb14 Date: Sun, 16 Oct 2022 17:49:42 -0500 Subject: [PATCH] wsjtx cmake docs off --- AmRRON-Setup-Script.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index a52af1d..e34320e 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1268,7 +1268,10 @@ sudo apt-get -y install pulseaudio pavucontrol pulseaudio-utils || function voacap_install() { - sudo apt-get -y install gfortran || +if apt-cache show gnome-doc-utils; then + + + sudo apt-get -y install gfortran || { ERRCODE="Failed to get gfortran dependency for VOACAPL"; errors; return; } cd $USERDIR && wget -N www.qsl.net/hz1jw/voacapl/downloads/voacapl-0.7.2.tar.gz || @@ -1285,12 +1288,7 @@ function voacap_install() { makeitshfbc || { ERRCODE="VOACAPL makeitshfbc failed"; errors; return; } - if [[ $OSCN =~ (eoan|focal|amber|ulyana) ]]; then - { echo voacap_os >> /tmp/cleanup; return; } - else - -# removed deps rarian-compat gnome-doc-utils for testing - sudo apt-get -y install yelp python3-gi python3-gi-cairo \ + sudo apt-get -y install yelp python3-gi python3-gi-cairo rarian-compat gnome-doc-utils \ pkg-config python3-dateutil python3-mpltoolkits.basemap python3-cairocffi libgtk-3-dev gettext || { ERRCODE="Failed to get dependencies for VOACAPL pythonprop GUI"; errors; return; } @@ -1304,6 +1302,12 @@ pkg-config python3-dateutil python3-mpltoolkits.basemap python3-cairocffi libgtk ./configure && sudo make install || { ERRCODE="Failed to compile VOACAPL pythonprop GUI"; errors; return; } + +else + + { echo voacap_os >> /tmp/cleanup; } && { ERRCODE="VOACAP GUI is not supported on your OS."; errors; return; } + + fi } @@ -1442,7 +1446,7 @@ WSJTXDIR=$(echo $WSJTXPKG | sed 's/.tgz//') cd $USERDIR/$WSJTXDIR - cmake . && cmake --build . -- -j4 && sudo make install || + cmake . && cmake -DWSJT_SKIP_MANPAGES=ON -DWSJT_GENERATE_DOCS=OFF && cmake --build . -- -j4 && sudo make install || { ERRCODE="Failed to build WSJTX."; errors; return; } @@ -3891,7 +3895,7 @@ TEXT="JS8Call does not yet support Ubuntu 19.10." voacap_os) TITLE="VOACAPL pythonprop GUI Unsupported Operating System." -TEXT="VOACAPL pythonprop GUI does not yet support Ubuntu 19.10." +TEXT="VOACAPL pythonprop GUI does not your OS." cleanupyad ;;