diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index ade2899..201578c 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -268,7 +268,7 @@ else fi if hash js8call 2>/dev/null; then - JS8CALLVER="INSTALLED-v. Unknown" + JS8CALLVER=$(js8call --version | awk -F ' ' '{print $2}') else JS8CALLVER="NOT INSTALLED" fi @@ -439,7 +439,7 @@ fi NEWWSJTX=$(curl -s https://physics.princeton.edu/pulsar/K1JT/wsjtx.html | grep -o "wsjtx_[0-9].[0-9].[0-9]*" | awk -F "_" '{print $2}' | head -n 1) -NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep "" | grep -o [0-9].[0-9]) +NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep .tgz | sed 's/.*js8call-/js8call-/;s/<.*$//' | sed 's/js8call-//;s/.tgz.*$//') echo "100% Complete"