From 4fb70f56d2945ecf34b2cac2727078e4816cf816 Mon Sep 17 00:00:00 2001 From: tb14 Date: Mon, 30 Jun 2025 20:17:44 -0500 Subject: [PATCH] version check for 2.2.0 js8call update and voacpl --- AmRRON-Setup-Script.sh | 53 +++++------------------------------------- 1 file changed, 6 insertions(+), 47 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 64cb1d7..52f6733 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1554,52 +1554,6 @@ fi } -function voacap_install_old() { - - if apt-cache show gnome-doc-utils &>/dev/null; then - - sudo apt-get -y install gfortran || - { ERRCODE="Failed to get gfortran dependency for VOACAPL"; errors; return; } - - cd $USERDIR && wget -N https://github.com/jawatson/voacapl/archive/refs/tags/v.0.7.6.tar.gz || - { ERRCODE="Failed to download VOACAPL"; errors; return; } - - tar -xzf voacapl-0.7.6.tar.gz && rm voacapl-0.7.6.tar.gz && cd voacapl-0.7.6 || - { ERRCODE="Failed to extract VOACAPL"; errors; return; } - - - ./configure && make -j4 && sudo make install || - { ERRCODE="Failed to compile VOACAPL"; errors; return; } - - - makeitshfbc || - { ERRCODE="VOACAPL makeitshfbc failed"; errors; return; } - - sudo apt-get -y install yelp python3-gi python3-gi-cairo rarian-compat gnome-doc-utils \ -pkg-config python3-dateutil python3-cairocffi libgtk-3-dev gettext || - { ERRCODE="Failed to get dependencies for VOACAPL pythonprop GUI"; errors; return; } - - cd $USERDIR && wget -N www.qsl.net/hz1jw/pythonprop/downloads/pythonprop-0.28.tar.gz || - { ERRCODE="Failed to download VOACAPL pythonprop GUI"; errors; return; } - - - tar -xzf pythonprop-0.28.tar.gz && rm pythonprop-0.28.tar.gz && cd pythonprop-0.28 || - { ERRCODE="Failed to extract VOACAPL pythonprop GUI"; errors; return; } - - - ./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 -} - - - function voacap_install() { @@ -1607,8 +1561,9 @@ function voacap_install() { echo "VOACAPL server unresponsive or broken link." >> /tmp/failures return fi - if [[ ${VOACAPLVER} == ${NEWVOACAPL} ]]; then + if [[ ${VOACAPLVER} == ${NEWVOACAPL} || ${NEWVOACAPL} == "0.7.6" ]]; then echo "VOACAPL is already at the most current version" + return else echo "Installing / Updating VOACAPL to version ${NEWVOACAPL}" @@ -1949,6 +1904,10 @@ fi } function js8call_2.2.0_install() { +if [[ ${JS8CALLVER} == "2.2.0" ]]; then + echo "JS8Call 2.2.0 already installed" + return +fi wget -P /tmp/ -N http://files.js8call.com/2.2.0/js8call_2.2.0_20.04_amd64.deb || { ERRCODE="Failed to download JS8Call 2.2.0"; errors; return; }