From 488d467a5105a8bd9ecd56a67e860e9f60879701 Mon Sep 17 00:00:00 2001 From: tb14 Date: Tue, 1 Jul 2025 12:41:35 -0500 Subject: [PATCH] commstat v2 --- AmRRON-Setup-Script.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index fb3a762..4d6cd59 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1814,14 +1814,27 @@ chmod +x $HOME/Desktop/commstat.desktop || { ERRCODE="Failed to make desktop icon for CommstatOne executable"; errors; } if [[ ! -f $USERDIR/icons/commstat.jpg ]]; then - mkdir -p $USERDIR/icons && wget --no-check-certificate -O $USERDIR/icons/commstat.jpg -N https://amrron.com/wp-content/uploads/2023/02/JS8Call_Commstat_Data.jpg || - { ERRCODE="Failed to icon image for commstat"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/commstat.jpg $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for commstat"; errors; } fi fi } +function commstat-v2() { + +if [[ ! -f $USERDIR/commstatone/commstat.py ]]; then + comstat_install +else + cd $USERDIR && git clone https://gitlab.com/amrron/commstat-v2.git || + { ERRCODE="Failed to clone CommStat V2 repository"; errors; } + + cp -r $USERDIR/commstat-v2/* $USERDIR/commstatone/ || + { ERRCODE="Failed to copy files to Commstatone directory"; errors; } +fi + +} function js8call_install() { @@ -3587,6 +3600,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "JS8CALL" "JS8Call Weak Signal QSO program." "${JS8CALLVER}" "${NEWJS8CALLVER}" \ false "JS8CALL_2.2.0" "JS8Call Weak Signal QSO program. Stable v. 2.2.0" "${JS8CALLVER}" "${NEWJS8CALLVER}" \ false "COMMSTATONE" "JS8Call mapping (Mint only)" "Unknown" "Unknown" \ + false "COMMSTATV2" "JS8Call mapping - KD9DSS modified" "Unknown" "Unknown" \ false "PULSE" "Pulseaudio suite. Includes pulseaudio, pavucontrol, and pulseaudio-utils." "Unable to determine" "Unable to determine" \ false "PIPEWIRE" "Removes Pipewire and reverts system to pulseaudio." "Unable to determine" "Unable to determine" \ false "UBLOX" "Installs programs and settings to use the UBLOX GPS for system time." "Unable to determine" "Unable to determine" \ @@ -4202,6 +4216,9 @@ cat /tmp/results | yad --text-info --center \ COMMSTATONE) echo -e ${ACTION}"Installing / Updating COMMATATONE"${NOCOLOR} comstat_install ;; + COMMSTATV2) echo -e ${ACTION}"Installing / Updating COMMATAT V2"${NOCOLOR} + commstat-v2 + ;; UBLOX) echo -e ${ACTION}"Installing / Updating UBLOX"${NOCOLOR} ublox_gps_setup ;;