diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index da901e5..63b0743 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -834,11 +834,6 @@ fi 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 || - { ERRCODE="Failed to install fldigi from apt"; errors; return; } - else echo "Installing / Updating FLDIGI version ${NEWFLDIGI}" 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; } @@ -859,7 +854,7 @@ tar.gz && cd fldigi-${NEWFLDIGI} || install || { ERRCODE="Failed to compile FLDIGI"; errors; return; } fi -fi + fi } @@ -876,15 +871,6 @@ fi #if [[ ${FLMSG} == ${NEWFLMSG} || ${FLMSG} == 4.0.24.02 ]]; then # echo "FLMSG 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 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 || @@ -900,8 +886,7 @@ fi ./configure && make && sudo make install || { ERRCODE="Failed to compile FLMSG"; errors; return; } fi - fi - fi + fi } function flmsg_install_19() { @@ -939,13 +924,7 @@ fi 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}" + echo "Installing / Updating FLAMP to version ${NEWFLAMP}" sleep 2 cd $USERDIR && wget -N https://www.w1hkj.org/files/flamp/flamp-${NEWFLAMP}.tar.gz || { ERRCODE="Failed to download FLAMP"; errors; return; } @@ -961,8 +940,6 @@ fi install || { ERRCODE="Failed to compile FLAMP"; errors; return; } fi - -fi fi } @@ -1002,13 +979,7 @@ fi 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}" + echo "Installing / Updating FLRIG to version ${NEWFLRIG}" sleep 2 cd $USERDIR && wget -N https://www.w1hkj.org/files/flrig/flrig-${NEWFLRIG}.tar.gz || { ERRCODE="Failed to download FLRIG"; errors; return; } @@ -1024,7 +995,6 @@ fi install || { ERRCODE="Failed to compile FLRIG"; errors; return; } fi -fi fi } @@ -1038,7 +1008,7 @@ fi echo "FLWRAP is already at the most current version" else - if [[ $OSCN =~ (vanessa|resolute) ]]; then + if [[ $OSCN = "vanessa" ]]; then sudo apt install -y flwrap || { ERRCODE="Unable to install FLWRAP from repositories."; errors; return; } else