changed js8call version checking / downloading.

This commit is contained in:
tb14
2019-12-03 15:33:50 -08:00
parent 4a2dfd77a0
commit 4f78634a50
+26 -10
View File
@@ -433,7 +433,7 @@ 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) 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)
NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep "<strong>" | grep -o [0-9].[0-9].[0-9]) NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep "<strong>" | grep -o [0-9].[0-9])
echo "100% Complete" echo "100% Complete"
@@ -493,7 +493,7 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \
| awk '{print $1}') | awk '{print $1}')
VER=$(grep "VERSION_ID" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"') VER=$(grep "VERSION_ID" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"')
declare -A VER_MAP=(["10"]="buster" ["9"]="stretch" ["8"]="jessie" ["16.04"]="xenial" \ declare -A VER_MAP=(["10"]="buster" ["9"]="stretch" ["8"]="jessie" ["16.04"]="xenial" \
["14.04"]="trusty" ["18.04"]="bionic" ["18.10"]="cosmic" ["19.04"]="disco" ["18"]="sara" ["18.1"]="serena" \ ["14.04"]="trusty" ["18.04"]="bionic" ["18.10"]="cosmic" ["19.04"]="disco" ["19.10"]="eoan" ["18"]="sara" ["18.1"]="serena" \
["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ) ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" )
OSCN=${VER_MAP["${VER}"]} OSCN=${VER_MAP["${VER}"]}
@@ -502,7 +502,7 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \
case ${PLAT} in case ${PLAT} in
Ubuntu|Raspbian|Debian|LinuxMint) Ubuntu|Raspbian|Debian|LinuxMint)
case ${OSCN} in case ${OSCN} in
trusty|xenial|bionic|cosmic|disco|jessie|stretch|buster|sara|serena|sonya|sylvia|tara|tessa|tina) trusty|xenial|bionic|cosmic|disco|eoan|jessie|stretch|buster|sara|serena|sonya|sylvia|tara|tessa|tina)
;; ;;
*) *)
maybeOS_Support maybeOS_Support
@@ -1304,27 +1304,43 @@ function amrronforms_install() {
function js8call_install() { function js8call_install() {
#if [[ ${PLAT} = "Raspbian" ]]; then
# SYS=$"armhf"
# elif [[ $(uname -m) = x86_64 ]]; then
# if [[ $OSCN =~ (tara|tessa|tina|bionic|cosmic|disco) ]]; then
# SYS=$"18.04_amd64"
# elif [[ $OSCN =~ (sara|serena|sonya|sylvia|trusty|xenial) ]]; then
# SYS=$"16.04_amd64"
# fi
# else
# SYS=$"i386"
# fi
if [[ ${PLAT} = "Raspbian" ]]; then if [[ ${PLAT} = "Raspbian" ]]; then
SYS=$"armhf" js8call_link=$(curl -s http://files.js8call.com/latest.html | grep -o "http://files.js8call.com/[0-9].[0-9].[0-9]/js8call_[0-9].[0-9].[0-9]_armhf.deb" | head -n 1)
elif [[ $(uname -m) = x86_64 ]]; then elif [[ $(uname -m) = x86_64 ]]; then
if [[ $OSCN =~ (tara|tessa|tina|bionic|cosmic|disco) ]]; then if [[ $OSCN =~ (tara|tessa|tina|bionic|cosmic|disco|eoan) ]]; then
SYS=$"18.04_amd64" js8call_link=$(curl -s http://files.js8call.com/latest.html | grep -o "http://files.js8call.com/[0-9].[0-9].[0-9]/js8call_[0-9].[0-9].[0-9]_18.04_amd64.deb" | head -n 1)
elif [[ $OSCN =~ (sara|serena|sonya|sylvia|trusty|xenial) ]]; then elif [[ $OSCN =~ (sara|serena|sonya|sylvia|trusty|xenial) ]]; then
SYS=$"16.04_amd64" js8call_link=$(curl -s http://files.js8call.com/latest.html | grep -o "http://files.js8call.com/[0-9].[0-9].[0-9]/js8call_[0-9].[0-9].[0-9]_16.04_amd64.deb" | head -n 1)
fi fi
else else
SYS=$"i386" js8call_link=$(curl -s http://files.js8call.com/latest.html | grep -o "http://files.js8call.com/[0-9].[0-9].[0-9]/js8call_[0-9].[0-9].[0-9]_i386.deb" | head -n 1)
fi fi
sudo apt-get -y install libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediawidgets5 libqt5serialport5 || sudo apt-get -y install libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediawidgets5 libqt5serialport5 ||
{ ERRCODE="Failed to get dependencies for JS8Call"; errors; return; } { ERRCODE="Failed to get dependencies for JS8Call"; errors; return; }
#removed libqgsttools-p1 from dependencies #removed libqgsttools-p1 from dependencies
wget -P $USERDIR/ -N http://files.js8call.com/${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; }
wget -P $USERDIR/ -N ${js8call_link} ||
{ ERRCODE="Failed to download JS8Call"; errors; return; } { ERRCODE="Failed to download JS8Call"; errors; return; }
sudo dpkg -i $USERDIR/js8call_${NEWJS8CALLVER}_$SYS.deb || js8call_deb=$(echo ${js8call_link} | awk -F "/" '{print $5}')
sudo dpkg -i $USERDIR/$js8call_deb ||
{ ERRCODE="Failed to install JS8Call"; errors; return; } { ERRCODE="Failed to install JS8Call"; errors; return; }