diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 871184d..8357dbc 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v1.2.10 ######################## +######################## AmRRON Setup Script v1.3 ######################## ######################## Created by TB-14 ######################## -######################## 24 JAN 2025 ######################## +######################## 15 JUN 2026 ######################## ################################################################################ ################################################################################ # @@ -529,11 +529,7 @@ fi echo -e ${ACTION} "70% Complete"${NOCOLOR} -NEWCHIRP=$(curl -sL https://trac.chirp.danplanet.com/download\?stream\=next | \ -grep .tar.gz | awk -F 'chirp-' '{print $2}' | head -c 8) -if [[ $NEWCHIRP == "" ]]; then - NEWCHIRP="SERVER DOWN" -fi +NEWCHIRP=next-20260612 echo -e ${ACTION} "80% Complete"${NOCOLOR} @@ -544,7 +540,7 @@ echo -e ${ACTION} "80% Complete"${NOCOLOR} #fi #NEWELECTRUM="SERVER DOWN" -NEWVOACAPL=$(curl -sL https://api.github.com/repos/jawatson/voacapl/releases/latest | grep tag_name | awk -F 'v.' '{print $2}' | sed s/\",//) +NEWVOACAPL=$(curl -sL https://api.github.com/repos/jawatson/voacapl/releases/latest | grep tag_name | awk -F 'v' '{print $2}' | sed s/\",//) if [[ $NEWVOACAPL == "" ]]; then NEWVOACAPL="SERVER DOWN" fi @@ -587,7 +583,7 @@ if [[ $NEWARDOP == "" ]]; then fi -NEWWSJTX=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep -oP 'WSJT-X [0-9]+\.[0-9]+\.[0-9]+' | tail -n 1 | awk '{print $2}') +NEWWSJTX=$(curl -sL https://wsjt.sourceforge.io/downloads.html | grep -oP 'WSJT-X [0-9]+\.[0-9]+\.[0-9]+' | tail -n 1 | awk '{print $2}') NEWJS8CALLVER=$(curl -s https://api.github.com/repos/js8call/js8call/releases/latest | grep '"tag_name"' | sed -E 's/.*"v?([^"]+)".*/\1/') @@ -1622,20 +1618,16 @@ function voacap_install() { function chirp_install() { -if [[ $NEWCHIRP == "SERVER DOWN" ]]; then - echo "CHIRP server unresponsive or broken link." >> /tmp/failures - return -fi if [[ ${CHIRP} == ${NEWCHIRP} ]]; then echo "Chirp is already at the most current version" else - cd $USERDIR && wget https://trac.chirp.danplanet.com/chirp_next/next-$NEWCHIRP/chirp-$NEWCHIRP.tar.gz || + cd $USERDIR && wget https://archive.chirpmyradio.com/chirp_next/next-20260612/chirp-20260612.tar.gz || { ERRCODE="Failed to download Chirp-Next"; errors; return; } - tar -xvf chirp-$NEWCHIRP.tar.gz && cd chirp-$NEWCHIRP/ || + tar -xvf chirp-20260612.tar.gz && cd chirp-20260612/ || { ERRCODE="Failed to extract Chirp-Next"; errors; return; } sudo apt install -y git python3-wxgtk4.0 python3-serial python3-six python3-future python3-requests python3-pip pipx python3-yattag || @@ -1885,9 +1877,6 @@ if [[ ${JS8CALLVER} == "2.2.0" ]]; then return fi -wget -P /tmp/ -N http://files.js8call.com/2.2.0/js8call_2.2.0_20.04_amd64.deb || -{ ERRCODE="Failed to download JS8Call 2.2.0"; errors; return; } - if [[ ${JS8CALLVER} == "2.2.1-devel" ]]; then echo "JS8Call 2.2.1-devel currently installed. Removing 2.2.1-devel" cd ~/Radio/js8call && sudo make uninstall && cd $USERDIR || @@ -1900,15 +1889,12 @@ sudo apt remove js8call -y --allow-change-held-packages || fi -cd /tmp/ && sudo apt install -y ./js8call_2.2.0_20.04_amd64.deb || +cd ~/setup-scripts/Files/ && sudo apt install -y ./js8call_2.2.0_20.04_amd64.deb || { ERRCODE="Failed to install JS8Call 2.2.0"; errors; return; } sudo apt-mark hold js8call || { ERRCODE="Failed to mark JS8Call as hold"; errors; return; } -rm /tmp/js8call* 2>/dev/null || -{ ERRCODE="Failed to delete js8call deb file"; errors; return; } - } function flmsgviewer_install() { diff --git a/Files/VarAC_Installer_V12_0_0.exe b/Files/VarAC_Installer_V12_0_0.exe deleted file mode 100644 index b6e5df9..0000000 Binary files a/Files/VarAC_Installer_V12_0_0.exe and /dev/null differ diff --git a/Files/VarAC_Installer_V13_0_1.exe b/Files/js8call_2.2.0_20.04_amd64.deb similarity index 59% rename from Files/VarAC_Installer_V13_0_1.exe rename to Files/js8call_2.2.0_20.04_amd64.deb index b457bb3..d097641 100644 Binary files a/Files/VarAC_Installer_V13_0_1.exe and b/Files/js8call_2.2.0_20.04_amd64.deb differ diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 0106764..cc76510 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,5 @@ +# Version 1.3 +- fixing broken links # Version 1.2.10 - 22.3 zena support # Version 1.2.9