From 742a3be71ac8a3ae04484307dc93261ae19802eb Mon Sep 17 00:00:00 2001 From: tb14 Date: Fri, 27 Jun 2025 12:06:27 -0500 Subject: [PATCH] cleanup --- AmRRON-Setup-Script.sh | 12 ++++++++---- AmRRON-Vara-setup.sh | 4 ++-- changelogs/CHANGELOG-Setup-Script.md | 3 +++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 34855cd..6c18b3d 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1850,6 +1850,10 @@ fi if [[ $OSCN =~ wilma|xia ]]; then +if [[ -f $USERDIR/commstatone/commstat.py ]]; then + echo "CommstatOne already exists. Nothing done."; return +fi + cd ~/Radio/commstatone && sudo apt install -y python3.12-venv python3-pyqt5.qtwebengine || { ERRCODE="Failed to install python3.12-venv virtual environment dependencies"; errors; return; } @@ -1938,7 +1942,7 @@ if [[ ${JS8CALLVER} == ${NEWJS8CALLVER} ]]; then else -rm /tmp/js8call* && wget -P /tmp/ -N $NEWJS8CALLURL || +rm /tmp/js8call* 2>/dev/null && wget -P /tmp/ -N $NEWJS8CALLURL || { ERRCODE="Failed to download JS8Call"; errors; return; } if [[ ${JS8CALLVER} == "2.2.1-devel" ]]; then @@ -1956,7 +1960,7 @@ fi cd /tmp/ && sudo apt install -y ./$JS8CALL_DEB_NAME || { ERRCODE="Failed to install $JS8CALL_DEB_NAME"; errors; return; } -rm ~/Downloads/$JS8CALL_DEB_NAME || +rm /tmp/$JS8CALL_DEB_NAME 2>/dev/null || { ERRCODE="Failed to delete js8call deb file from Downloads directory"; errors; return; } @@ -1965,7 +1969,7 @@ fi function js8call_2.2.0_install() { -rm /tmp/js8* && wget -P /tmp/ -N http://files.js8call.com/2.2.0/js8call_2.2.0_20.04_amd64.deb || +rm /tmp/js8* 2>/dev/null && 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 @@ -1986,7 +1990,7 @@ cd /tmp/ && sudo apt install ./js8call_2.2.0_20.04_amd64.deb || sudo apt-mark hold js8call || { ERRCODE="Failed to mark JS8Call as hold"; errors; return; } -rm /tmp/js8call* || +rm /tmp/js8call* 2>/dev/null || { ERRCODE="Failed to delete js8call deb file"; errors; return; } } diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index eaf7a07..1a78c35 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -392,7 +392,7 @@ echo "Driver already installed" fi -cd $HOME/Downloads && wget ${VARAHFLINK} || +cd $HOME/Downloads && rm VARA* 2>/dev/null && wget ${VARAHFLINK} || { ERRCODE="Failed to download VARA HF. Visit https://downloads.winlink.org/ to download appropriate file. Unzip this file and install from terminal using the command: wine "; errors; return; } unzip VARA\ HF\ $VARAHFVER*.zip || @@ -429,7 +429,7 @@ else echo "Driver already installed" fi -cd $HOME/Downloads/ && wget ${VARAFMLINK} || +cd $HOME/Downloads/ && rm VARA* 2>/dev/null && wget ${VARAFMLINK} || { ERRCODE="Failed to download VARA FM. Visit https://downloads.winlink.org/ to download appropriate file. Unzip this file and install from terminal using the command: wine "; errors; return; } unzip VARA\ FM\ $VARAFMVER*.zip || diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 1f05780..e0e2421 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,6 @@ +# Version 1.2.5.1 +- Added break if commstat exists and was selected again. +- Moved JS8Call download to /tmp/ to avoid error if downloaded file exists. Fixed wrong command for removing old js8. # Version 1.2.5 - Fixed failed icon for QtTermTCP - Fixed failed to compile error for FLMSG