diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 5306b28..daa53fd 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v1.2.4 ######################## +######################## AmRRON Setup Script v1.2.5 ######################## ######################## Created by TB-14 ######################## ######################## 26 JUN 2025 ######################## ################################################################################ @@ -558,7 +558,7 @@ echo "90% Complete" #NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | sed -n 's/

Latest\ Stable\ Release\ //p' | awk -F '(' '{print $1}' | sed 's/-\ //' | sed 's/\ //' ) #NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | grep "Linux: Version" | awk -F 'Version' '{print $2}' | awk -F ' ' '{print $1}') -NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | grep "Latest Stable Release - " | awk -F "- " '{print $2}' | awk -F " " '{print $1}') +NEWVC=$(curl -sL https://veracrypt.io/en/Downloads.html | grep -oP 'VeraCrypt [0-9]+\.[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}') if [[ $NEWVC == "" ]]; then NEWVC="SERVER DOWN" fi @@ -594,7 +594,7 @@ fi #NEWWSJTX=$(curl -sL https://sourceforge.net/projects/wsjt/files | grep -o "wsjtx-[0-9].[0-9].[0-9]*" | awk -F "-" '{print $2}' | head -n 1) #NEWWSJTX=$(curl -sL https://sourceforge.net/projects/wsjt/files | grep "released" | awk -F "title=" '{print $2}' | awk -F "/" '{print $2}' | awk -F "wsjtx-" '{print $2}') NEWWSJTX=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep "Candidate release" | awk -F "WSJT-X " '{print $2}' | awk -F "" '{print $1}') -NEWWSJTX_STABLE=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep "Latest General Availability (GA) releases" | awk -F "WSJT-X " '{print $2}' | awk -F " " '{print $1}') +NEWWSJTX_STABLE=$(curl -sL https://wsjt.sourceforge.io/wsjtx.html | grep -oP 'WSJT-X [0-9]+\.[0-9]+\.[0-9]+' | tail -n 1 | awk '{print $2}') #NEWJS8CALLVER=$(curl -s http://files.js8call.com/latest.html | grep .tgz | sed 's/.*js8call-/js8call-/;s/<.*$//' | sed 's/js8call-//;s/.tgz.*$//') NEWJS8CALLVER=$(curl -s https://api.github.com/repos/js8call/js8call/releases/latest | grep '"tag_name"' | sed -E 's/.*"v?([^"]+)".*/\1/') @@ -893,10 +893,11 @@ fi 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/files/flmsg/flmsg-${NEWFLMSG}.tar.gz || + cd $USERDIR && wget -N https://www.w1hkj.org/alpha/flmsg/flmsg-4.0.24.01.tar.gz || { ERRCODE="Failed to download FLMSG"; errors; return; } - tar xzvf flmsg-${NEWFLMSG}.tar.gz && rm flmsg-${NEWFLMSG}.tar.gz\ - && cd flmsg-${NEWFLMSG} || + tar xzvf flmsg-4.0.24.01.tar.gz && rm flmsg-4.0.24.01.tar.gz\ + && cd flmsg-4.0.24.01 || { ERRCODE="Failed to extract FLMSG"; errors; return; } if [[ $(uname -m) = x86_64 ]]; then @@ -908,11 +909,6 @@ install || { ERRCODE="Failed to compile FLMSG"; errors; return; } fi -#Cleanup space from compiling -#if hash flmsg 2>/dev/null; then -# sudo rm -r $USERDIR/flmsg-${NEWFLMSG} -#fi - fi } @@ -2577,8 +2573,8 @@ chmod +x $PACKETDIR/QtTermTCP || { ERRCODE="Failed to make QTtermTCP executable"; errors; return; } if [[ ! -f $USERDIR/icons/qttermtcp_icon.png ]]; then - mkdir -p $PACKETDIR/icons && wget --no-check-certificate -O $PACKETDIR/icons/qttermtcp.png -N https://static-00.iconduck.com/assets.00/terminal-icon-256x256-5xq7v80y.png || - { ERRCODE="Failed to icon image for QtTermTCP"; errors; } + cp ~/setup-scripts/images/qttermtcp.png $USERDIR/icons/qttermtcp.png || + { ERRCODE="Failed to get icon image for QtTermTCP"; errors; } fi echo "[Desktop Entry] @@ -2587,7 +2583,7 @@ GenericName=QtTermTCP Comment=Terminal for packet. Path=$PACKETDIR/ Exec=$PACKETDIR/QtTermTCP -Icon=$PACKETDIR/icons/qttermtcp.png +Icon=$USERDIR/icons/qttermtcp.png Terminal=false Type=Application Categories=Radio;" > $HOME/Desktop/qttermtcp.desktop || diff --git a/VarAC-v11.02-Manual.pdf b/VarAC-v11.02-Manual.pdf deleted file mode 100644 index 99fc2cd..0000000 Binary files a/VarAC-v11.02-Manual.pdf and /dev/null differ diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 7538351..1f05780 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,8 @@ +# Version 1.2.5 +- Fixed failed icon for QtTermTCP +- Fixed failed to compile error for FLMSG +- Fixed WSJTX link not working +- Fixed Veracrypt link # Version 1.2.4 - Fixed JS8Call to pull 2.3.0. 2.2.0 is still default easy button until 2.3.0 is tested and post TREX. # Version 1.2.3