From bde5fe250626f3ccb0ee2e8e75541b85da34504e Mon Sep 17 00:00:00 2001 From: tb14 Date: Sat, 20 Jun 2026 18:12:31 -0500 Subject: [PATCH] fl suite resolute --- AmRRON-Setup-Script.sh | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index c208f27..da901e5 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -836,7 +836,7 @@ fi if [[ $OSCN = "resolute" ]]; then echo "Installing package manager version due to compiler error on kubuntu 26.04" - sudo apt install -y fldigi|| + sudo apt install -y fldigi || { ERRCODE="Failed to install fldigi from apt"; errors; return; } else @@ -878,6 +878,13 @@ fi else + + if [[ $OSCN = "resolute" ]]; then + echo "Installing package manager version due to compiler error on kubuntu 26.04" + sudo apt install -y flmsg || + { ERRCODE="Failed to install flmsg from apt"; errors; return; } + else + echo "Installing / Updating FLMSG to version ${NEWFLMSG}" #cd $USERDIR && wget -N https://www.w1hkj.org/files/flmsg/flmsg-${NEWFLMSG}.tar.gz || cd $USERDIR && wget -N https://www.w1hkj.org/alpha/flmsg/flmsg-4.0.24.02.tar.gz || @@ -893,7 +900,7 @@ fi ./configure && make && sudo make install || { ERRCODE="Failed to compile FLMSG"; errors; return; } fi - + fi fi } @@ -931,6 +938,13 @@ fi echo "FLAMP is already at the most current version" else + + if [[ $OSCN = "resolute" ]]; then + echo "Installing package manager version due to compiler error on kubuntu 26.04" + sudo apt install -y flamp|| + { ERRCODE="Failed to install flamp from apt"; errors; return; } + else + echo "Installing / Updating FLAMP to version ${NEWFLAMP}" sleep 2 cd $USERDIR && wget -N https://www.w1hkj.org/files/flamp/flamp-${NEWFLAMP}.tar.gz || @@ -948,11 +962,7 @@ install || { ERRCODE="Failed to compile FLAMP"; errors; return; } fi -#Cleanup space from compiling -#if hash flamp 2>/dev/null; then -# sudo rm -r $USERDIR/flamp-${NEWFLAMP} -#fi - +fi fi } @@ -991,6 +1001,13 @@ fi echo "FLRIG is already at the most current version" else + + if [[ $OSCN = "resolute" ]]; then + echo "Installing package manager version due to compiler error on kubuntu 26.04" + sudo apt install -y flrig || + { ERRCODE="Failed to install flrig from apt"; errors; return; } + else + echo "Installing / Updating FLRIG to version ${NEWFLRIG}" sleep 2 cd $USERDIR && wget -N https://www.w1hkj.org/files/flrig/flrig-${NEWFLRIG}.tar.gz || @@ -1007,7 +1024,7 @@ fi install || { ERRCODE="Failed to compile FLRIG"; errors; return; } fi - +fi fi } @@ -1021,7 +1038,7 @@ fi echo "FLWRAP is already at the most current version" else - if [[ $OSCN == "vanessa" ]]; then + if [[ $OSCN =~ (vanessa|resolute) ]]; then sudo apt install -y flwrap || { ERRCODE="Unable to install FLWRAP from repositories."; errors; return; } else