diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 3744287..8776f6c 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -640,10 +640,10 @@ fi else - if apt-cache show libjpeg9-dev; then - LIBJPG=libjpeg9-dev + if apt-cache show libjpeg62-turbo-dev &>/dev/null; then + LIBJPG=libjpeg62-turbo-dev else - LIBJPG=libjpeg62-turbo-dev + LIBJPG=libjpeg9-dev fi echo "Installing / Updating FLDIGI version ${NEWFLDIGI}" @@ -1284,7 +1284,7 @@ sudo apt-get -y install pulseaudio pavucontrol pulseaudio-utils || function voacap_install() { -if apt-cache show gnome-doc-utils; then +if apt-cache show gnome-doc-utils &>/dev/null; then sudo apt-get -y install gfortran || @@ -1514,7 +1514,7 @@ function ublox_gps_setup() { #Deps from Debian 10 #sudo apt-get -y install gpsd gpsd-clients python-gps chrony || -if apt-cache show gpsd-tools; then +if apt-cache show gpsd-tools &>/dev/null; then GPSDEP=gpsd-tools else GPSDEP=python-gps @@ -1951,7 +1951,7 @@ wget -P $PACKETDIR -N https://www.ka2ddo.org/ka2ddo/YAAC.zip || sudo apt-get -y install ca-certificates-java || { ERRCODE="Failed to get ca-certificates-java dependencies for YAAC"; errors; return; } -sudo apt-get -y install openjdk-8-jre librxtx-java unzip || +sudo apt-get -y install openjdk-11-jre librxtx-java unzip || { ERRCODE="Failed to get openjdk-8-jre librxtx-java unzip dependencies for YAAC"; errors; return; } unzip -o -d $PACKETDIR/YAAC $PACKETDIR/YAAC.zip || @@ -2698,7 +2698,7 @@ echo pybitmessagesetup >> /tmp/cleanup function bitmessage_install() { -if apt-cache show python-qt4; then +if apt-cache show python-qt4 &>/dev/null; then if hash pybitmessage 2>/dev/null; then diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 42b914b..e2f352f 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -2,6 +2,8 @@ - FLDIGI raspbian 64bit check - Fix 64bit check for diff OS based upon apt avaibility. - Veracrypt 64bit check + - FLDIGI 64bit fix + - YAAC to jdk-11 # Version 0.7.1 - Mint 21 tweaks