diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh
index fbe822f..c8a4a0e 100755
--- a/AmRRON-Setup-Script.sh
+++ b/AmRRON-Setup-Script.sh
@@ -1,9 +1,9 @@
#!/bin/bash
################################################################################
################################################################################
-######################## AmRRON Setup Script v1.3 ########################
+######################## AmRRON Setup Script v1.4 ########################
######################## Created by TB-14 ########################
-######################## 15 JUN 2026 ########################
+######################## 20 JUN 2026 ########################
################################################################################
################################################################################
#
@@ -552,8 +552,6 @@ NEWYAACVER=$(curl -sI https://www.ka2ddo.org/ka2ddo/YAAC.zip | grep -i Last-Modi
echo -e ${ACTION} "90% Complete"${NOCOLOR}
-#NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | sed -n 's/
Latest\ Stable\ Release\ //p' | awk -F '(' '{print $1}' | sed 's/-\ //' | sed 's/\ //' )
-#NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | grep "Linux: Version" | awk -F 'Version' '{print $2}' | awk -F ' ' '{print $1}')
NEWVC=$(curl -sL https://veracrypt.io/en/Downloads.html | grep -oP 'VeraCrypt [0-9]+\.[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}')
if [[ $NEWVC == "" ]]; then
NEWVC="SERVER DOWN"
@@ -654,7 +652,7 @@ function check_os_support() {
VER=$(grep "VERSION_ID" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"')
declare -A VER_MAP=(["11"]="bullseye" ["10"]="buster" ["9"]="stretch" ["8"]="jessie" ["16.04"]="xenial" \
["14.04"]="trusty" ["18.04"]="bionic" ["18.10"]="cosmic" ["19.04"]="disco" ["19.10"]="eoan" ["20.04"]="focal" ["18"]="sara" ["18.1"]="serena" \
- ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ["20.3"]="una" ["21"]="vanessa" ["21.1"]="vera" ["21.2"]="victoria" ["21.3"]="virginia" ["22"]="wilma" ["22.1"]="xia" ["22.2"]="zara" ["22.3"]="zena" ["24.04"]="noble" ["25.04"]="plucky" )
+ ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ["20.3"]="una" ["21"]="vanessa" ["21.1"]="vera" ["21.2"]="victoria" ["21.3"]="virginia" ["22"]="wilma" ["22.1"]="xia" ["22.2"]="zara" ["22.3"]="zena" ["24.04"]="noble" ["25.04"]="plucky" ["26.04"]="resolute" )
OSCN=${VER_MAP["${VER}"]}
fi
@@ -662,7 +660,7 @@ function check_os_support() {
case ${PLAT} in
Raspbian|Debian|Linuxmint|Pop|Ubuntu)
case ${OSCN} in
- virginia|wilma|xia|zara|zena|noble|plucky)
+ virginia|wilma|xia|zara|zena|noble|plucky|resolute)
;;
*)
maybeOS_Support
@@ -829,21 +827,20 @@ fi
else
- #if apt-cache show libjpeg62-turbo-dev &>/dev/null; then
- # LIBJPG=libjpeg62-turbo-dev
- # else
- # LIBJPG=libjpeg9-dev
- # fi
+
if [[ $(uname -m) = aarch64 ]]; then
LIBJPG=libjpeg62-turbo-dev
else
LIBJPG=libjpeg9-dev
fi
-
+ if [[ $OSCN = "resolute" ]]; then
+ echo "Installing package manager version due to compiler error on kubuntu 26.04"
+ sudo apt install -y fldigi_install ||
+ { ERRCODE="Failed to install fldigi from apt"; errors; return; }
+ else
echo "Installing / Updating FLDIGI version ${NEWFLDIGI}"
-# sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libudev-dev libltdl-dev libusb-1.0-0 libsamplerate0 libsamplerate0-dev libsigx-2.0-dev libsigc++-2.0-dev libpopt-dev tcl8.6-dev libspeex-dev libasound2-dev alsa-utils libgcrypt20-dev libpopt-dev libfltk1.3-dev libpng++-dev portaudio19-dev libpulse-dev libportaudiocpp0 libsndfile1-dev ||
sudo apt-get install -y libfltk1.3-dev $LIBJPG libxft-dev libxinerama-dev libxcursor-dev libsndfile1-dev libsamplerate0-dev portaudio19-dev libpulse-dev libusb-1.0-0-dev texinfo libudev-dev || { ERRCODE="Failed to get dependencies for FLDIGI."; errors; return; }
cd $USERDIR && wget -N https://www.w1hkj.org/files/fldigi/fldigi-${NEWFLDIGI}.tar.gz ||
@@ -862,11 +859,12 @@ tar.gz && cd fldigi-${NEWFLDIGI} ||
install ||
{ ERRCODE="Failed to compile FLDIGI"; errors; return; }
fi
-
+fi
fi
}
+
function flmsg_install() {
if [[ $NEWFLMSG == "SERVER DOWN" ]]; then
@@ -1130,6 +1128,17 @@ function ardopcf_install() {
rm $ARDOPDIR/*.txt ||
{ ERRCODE="Failed to remove previous date marker file"; errors; return; }
fi
+
+ if [[ $OSCN="resolute" ]]; then
+
+ mkdir -p $ARDOPDIR && cd $ARDOPDIR ||
+ { ERRCODE="Failed to create ardopcf directory"; errors; return; }
+
+ wget -N -O ardopc https://github.com/pflarue/ardop/releases/download/1.0.4.1.3/ardopcf_amd64_Linux_64 ||
+ { ERRCODE="Failed to download ardopcf binary"; errors; return; }
+
+
+ else
mkdir -p $ARDOPDIR && mkdir $ARDOPDIR/build && cd $ARDOPDIR/build ||
{ ERRCODE="Failed to create ardopcf build directory"; errors; return; }
git clone https://github.com/pflarue/ardop.git ||
@@ -1141,6 +1150,7 @@ function ardopcf_install() {
rm -r $ARDOPDIR/build && touch $ARDOPDIR/v$NEWARDOPCF.txt ||
{ ERRCODE="Failed to remove build directory and create current date marker"; errors; return; }
fi
+fi
if [[ ! -f $HOME/.asoundrc ]]; then
echo "pcm.ARDOP {
@@ -3309,6 +3319,9 @@ if [[ $VCVER == $NEWVC ]]; then
elif [[ $OSCN = "bullseye" ]]; then
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-11-${SYS}.deb"
+
+ elif [[ $OSCN = "resolute" ]]; then
+ VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-26.04-${SYS}.deb"
elif [[ $OSCN =~ (wilma|xia|zara|zena|noble|plucky) ]]; then
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-24.04-${SYS}.deb"
@@ -3378,7 +3391,7 @@ if apt-cache show python-qt4 &>/dev/null; then
## Get PyBitmessage via appimage if running Linuxmint
-elif [[ $PLAT = Linuxmint ]]; then
+elif [[ $PLAT =~ (Linuxmint|Ubuntu) ]]; then
BMAIRELDATE=$(curl -s https://appimage.bitmessage.org/releases/ | tail -n 3 | grep -o [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] | tail -n 1)
BMAIFILE=$(curl -s https://appimage.bitmessage.org/releases/20221018/ | grep .AppImage | awk -F '"' '{print $2}')
diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md
index cc76510..3d494a6 100644
--- a/changelogs/CHANGELOG-Setup-Script.md
+++ b/changelogs/CHANGELOG-Setup-Script.md
@@ -1,3 +1,5 @@
+# Version 1.4
+- cleanup of various errors. Confirmed support of all EasyButton items on Mint 22.3 and Kubuntu 26.04
# Version 1.3
- fixing broken links
# Version 1.2.10