diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 949f243..9ed5603 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v1.0.1 ######################## +######################## AmRRON Setup Script v1.0.2 ######################## ######################## Created by TB-14 ######################## -######################## 24 JAN 2025 ######################## +######################## 26 JAN 2025 ######################## ################################################################################ ################################################################################ # @@ -446,38 +446,38 @@ if [[ $NEWHAMLIB == "" ]]; then fi -NEWFLDIGI=$(curl -s https://sourceforge.net/projects/fldigi/files/fldigi/ | \ -grep .tar.gz | head -1 | awk -F "-" '{print $2}' | awk -F ".tar" '{print $1}') +NEWFLDIGI=$(curl -s https://www.w1hkj.org/files/fldigi/ | grep -Eo fldigi-'[0-9]{1,4}.[0-9]{1,4}.[0-9]{1,4}'.tar.gz | \ + sort -rn | head -n 1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') if [[ $NEWFLDIGI == "" ]]; then NEWFLDIGI="SERVER DOWN" fi echo "10% Complete" -NEWFLMSG=$(curl -s https://sourceforge.net/projects/fldigi/files/flmsg/ | \ -grep .tar.gz | head -1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') +NEWFLMSG=$(curl -s https://www.w1hkj.org/files/flmsg/ | grep -Eo flmsg-'[0-9]{1,4}.[0-9]{1,4}.[0-9]{1,4}'.tar.gz | \ + sort -rn | head -n 1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') if [[ $NEWFLMSG == "" ]]; then NEWFLMSG="SERVER DOWN" fi echo "20% Complete" -NEWFLAMP=$(curl -s https://sourceforge.net/projects/fldigi/files/flamp/ | \ -grep .tar.gz | head -1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') +NEWFLAMP=$(curl -s https://www.w1hkj.org/files/flamp/ | grep -Eo flamp-'[0-9]{1,4}.[0-9]{1,4}.[0-9]{1,4}'.tar.gz | \ + sort -rn | head -n 1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') if [[ $NEWFLAMP == "" ]]; then NEWFLAMP="SERVER DOWN" fi echo "30% Complete" -NEWFLRIG=$(curl -s https://sourceforge.net/projects/fldigi/files/flrig/ | \ -grep .tar.gz | head -1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') +NEWFLRIG=$(curl -s https://www.w1hkj.org/files/flrig/ | grep -Eo flrig-'[0-9]{1,4}.[0-9]{1,4}.[0-9]{1,4}'.tar.gz | \ + sort -rn | head -n 1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') if [[ $NEWFLRIG == "" ]]; then NEWFLRIG="SERVER DOWN" fi -NEWFLWRAP=$(curl -s https://sourceforge.net/projects/fldigi/files/flwrap/ | \ -grep .tar.gz | head -1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') +NEWFLWRAP=$(curl -s https://www.w1hkj.org/files/flwrap/ | grep -Eo flwrap-'[0-9]{1,4}.[0-9]{1,4}.[0-9]{1,4}'.tar.gz | \ + sort -rn | head -n 1 | awk -F "-" '{print $2}' | awk -F ".tar.gz" '{print $1}') if [[ $NEWFLWRAP == "" ]]; then NEWFLWRAP="SERVER DOWN" fi @@ -3523,7 +3523,6 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "FLMSG" "FLMSG Radio Program" "${FLMSG}" "${NEWFLMSG}" \ false "FLMSG_4.0.19" "FLMSG Radio Program" "${FLMSG}" "4.0.19" \ false "FLAMP" "FLAMP Radio Program" "${FLAMP}" "${NEWFLAMP}" \ - false "FLAMP_2.2.14" "FLAMP Radio Program" "${FLAMP}" "2.2.14" \ false "FLRIG" "FLRIG Radio Control Program" "${FLRIG}" "${NEWFLRIG}" \ false "FLWRAP" "FLWRAP Radio Control Program" "${FLWRAP}" "${NEWFLWRAP}" \ false "ARDOP" "Downloads the newest ARDOP v1 TNC" "Unknown" "${NEWARDOP}" \ @@ -3548,7 +3547,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s rc=$? if [[ $rc == 2 ]]; then - radioArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP_2.2.14 FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX_STABLE JS8CALL PULSE UBLOX FORMS COMMSTATONE) + radioArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX_STABLE JS8CALL PULSE UBLOX FORMS COMMSTATONE) for i in "${radioArray[@]}" do @@ -4119,7 +4118,7 @@ rc=$? mkdir -p $USERDIR fi CONKYSEL=STANDARD - easyArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP_2.2.14 FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX_STABLE JS8CALL PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS COMMSTATONE) + easyArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX_STABLE JS8CALL PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS COMMSTATONE) for i in "${easyArray[@]}" do diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 2f7d0a6..eb0f520 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,5 @@ +# Version 1.0.2 +- Updated FL Suite links as updates are no longer being sent to sourceforge. # Version 1.0.1 - Added cleaned version of commstat database to get rid of old entries. Update to PDF. # Version 1.0