diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 2befff5..33b189f 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.5.4.3 ######################## +######################## AmRRON Setup Script v0.5.4.4 ######################## ######################## Created by TB-14 ######################## -######################## 27 Mar 2019 ######################## +######################## 31 Mar 2019 ######################## ################################################################################ ################################################################################ # @@ -404,51 +404,12 @@ fi NEWWSJTX=$(curl -s http://physics.princeton.edu/pulsar/K1JT/wsjtx.html | grep -o "wsjtx_[0-9].[0-9].[0-9]*" | awk -F "_" '{print $2}' | head -n 1) js8_version_checking -echo ${NEWJS8CALLVER} +NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep "" | grep -o [0-9].[0-9].[0-9]) echo "100% Complete" } -### Overly complex function to determine most current version of JS8Call without signing in to the website. -## If anyone has a better way I'm all for it.... - - function js8_version_checking() { - #local js8release=14 - #local js8version=1 - #local rmax=16 - #local vmax=9 - - #function retry() { - - # if [[ $js8version -lt $vmax ]]; then - # ((js8version++)) - - # else - # js8version=0 - # ((js8release++)) - # fi -# } - - - #function checkjs8call() { - # wget -q --spider https://s3.amazonaws.com/js8call/0.${js8release}.${js8version}/js8call_0.${js8release}.${js8version}-devel_18.04_amd64.deb - # rc=$? - # if [[ rc -eq 0 ]]; then - # NEWJS8CALLVER="0.${js8release}.${js8version}" - # else - # retry; checkjs8call; - # fi - - #} - - - #checkjs8call -#https://s3.amazonaws.com/js8call/1.0.0-rc1/js8call_1.0.0-rc1_armhf.deb - -NEWJS8CALLVER="1.0.0-rc3" - - } @@ -1330,7 +1291,7 @@ sudo apt-get -y install libqgsttools-p1 libqt5multimedia5 libqt5multimedia5-plug { ERRCODE="Failed to get dependencies for JS8Call"; errors; return; } -wget -P $USERDIR/ -N https://s3.amazonaws.com/js8call/${NEWJS8CALLVER}/js8call_${NEWJS8CALLVER}_$SYS.deb || +wget -P $USERDIR/ -N http://files.js8call.com/${NEWJS8CALLVER}/js8call_${NEWJS8CALLVER}_$SYS.deb || { ERRCODE="Failed to download JS8Call"; errors; return; } sudo dpkg -i $USERDIR/js8call_${NEWJS8CALLVER}_$SYS.deb || diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index e9fb075..33a7108 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,7 @@ +# Version 0.5.4.4 + + - Updated JS8Call Script to automatically query current version (1.0 released today.) + # Version 0.5.4.3 - Updated JS8Call Script to 1.0.0-rc3