diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index b1d4c28..68798ba 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v1.4 ######################## +######################## AmRRON Setup Script v1.5 ######################## ######################## Created by TB-14 ######################## -######################## 20 JUN 2026 ######################## +######################## 13 SEP 2026 ######################## ################################################################################ ################################################################################ # @@ -860,22 +860,22 @@ fi -function flmsg_install() { +function flmsg-alpha_install() { if [[ $NEWFLMSG == "SERVER DOWN" ]]; then echo "FLMSG server unresponsive or broken link." >> /tmp/failures return fi - if [[ ${FLMSG} == 4.0.24.02 ]]; then + if [[ ${FLMSG} == 4.0.24.04 ]]; then echo "FLMSG is already at the most current version" 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 || + cd $USERDIR && wget -N https://www.w1hkj.org/alpha/flmsg/flmsg-4.0.24.04.tar.gz || { ERRCODE="Failed to download FLMSG"; errors; return; } - tar xzvf flmsg-4.0.24.02.tar.gz && rm flmsg-4.0.24.02.tar.gz\ - && cd flmsg-4.0.24.02 || + tar xzvf flmsg-4.0.24.04.tar.gz && rm flmsg-4.0.24.04.tar.gz\ + && cd flmsg-4.0.24.04 || { ERRCODE="Failed to extract FLMSG"; errors; return; } if [[ $(uname -m) = x86_64 ]]; then @@ -888,6 +888,36 @@ else fi } + +function flmsg_install() { + +if [[ $NEWFLMSG == "SERVER DOWN" ]]; then + echo "FLMSG server unresponsive or broken link." >> /tmp/failures + return +fi + if [[ ${FLMSG} == 4.0.24.02 ]]; then + echo "FLMSG is already at the most current version" + +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 || + { ERRCODE="Failed to download FLMSG"; errors; return; } + tar xzvf flmsg-${NEWFLMSG}.tar.gz && rm flmsg-${NEWFLMSG}.tar.gz\ + && cd flmsg-${NEWFLMSG} || + { ERRCODE="Failed to extract FLMSG"; errors; return; } + + if [[ $(uname -m) = x86_64 ]]; then + ./configure --enable-optimizations=native && make && sudo make install || + { ERRCODE="Failed to compile FLMSG"; errors; return; } + else + ./configure && make && sudo make install || + { ERRCODE="Failed to compile FLMSG"; errors; return; } + fi + fi + } + + function flmsg_install_19() { if [[ ${FLMSG} == 4.0.19 ]]; then @@ -3578,7 +3608,8 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "HAMLIB4.5.5" "Hamlib 4.5.5 | JS8Call will not build with Hamlib 4.6. 4.5.5 is default with Easy Button" \ "${HAMLIB}" "${NEWHAMLIB}" \ false "FLDIGI" "FLDIGI Radio Program" "${FLDIGI}" "${NEWFLDIGI}" \ - false "FLMSG" "FLMSG Radio Program" "${FLMSG}" "4.0.24.02" \ + false "FLMSG" "FLMSG Radio Program" "${FLMSG}" "4.0.24" \ + false "FLMSG_Alpha" "FLMSG Radio Program" "${FLMSG}" "4.0.24.04" \ false "FLMSG_4.0.19" "FLMSG Radio Program" "${FLMSG}" "4.0.19" \ false "FLAMP" "FLAMP Radio Program" "${FLAMP}" "${NEWFLAMP}" \ false "FLRIG" "FLRIG Radio Control Program" "${FLRIG}" "${NEWFLRIG}" \ @@ -4149,6 +4180,9 @@ cat /tmp/results | yad --text-info --center \ FLMSG) echo -e ${ACTION}"Installing / Updating FLMSG"${NOCOLOR} flmsg_install ;; + FLMSG_Alpha) echo -e ${ACTION}"Installing / Updating FLMSG"${NOCOLOR} + flmsg-alpha_install + ;; FLMSG_4.0.19) echo -e ${ACTION}"Installing / Updating FLMSG"${NOCOLOR} flmsg_install_19 ;; diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 3d494a6..e689013 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,5 @@ +# Version 1.5 +- fixed FLMSG install error. Now defaults to old FLMSG 4.0.24 and gives the option for 4.0.24.04 in the menu. # Version 1.4 - cleanup of various errors. Confirmed support of all EasyButton items on Mint 22.3 and Kubuntu 26.04 # Version 1.3