From 8d73a6c44b95e2ed27eda777e17fab2480f4b452 Mon Sep 17 00:00:00 2001 From: tb14 Date: Mon, 7 Nov 2022 16:18:36 -0600 Subject: [PATCH] added comstatx for mint testing typos and changelog --- AmRRON-Setup-Script.sh | 33 ++++++++++++++++++++++++++-- AmRRON-Vara-setup.sh | 2 +- changelogs/CHANGELOG-Setup-Script.md | 3 +++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index e59b38d..48bdc78 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1567,6 +1567,31 @@ function amrronforms_install() { fi } +function comstat_install() { + +if [[ $OSCN =~ una|vanessa ]]; then + +cd $USERDIR && wget https://github.com/W5DMH/CommStatX/raw/main/commstatx.tar.gz || +{ ERRCODE="Failed to download comstat archive"; errors; return; } + +tar -xzvf commstatx.tar.gz && rm comstatx.tar.gz|| +{ ERRCODE="Failed to extract comstat archive"; errors; return; } + +cd $USERDIR/comstatx || +{ ERRCODE="Failed to enter comstat directory"; errors; return; } + +python3 -m pip install --upgrade pip || +{ ERRCODE="Failed to perform python pip upgrade"; errors; return; } + +python3 install.py || +{ ERRCODE="Failed to install comstatx"; errors; return; } + +else + echo "Comstat install has not been tested on your distribution." + +fi + +} function js8call_install() { @@ -3076,6 +3101,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "CHIRP" "Radio Programing Software" "${CHIRP}" "${NEWCHIRP}" \ false "WSJTX" "WSJTX Weak Signal QSO program" "${WSJTXVER}" "${NEWWSJTX}" \ false "JS8CALL" "JS8Call Weak Signal QSO program." "${JS8CALLVER}" "${NEWJS8CALLVER}" \ + false "COMSTATX" "JS8Call mapping (Mint only)" "Unknown" "Beta 0.06" \ false "PULSE" "Pulseaudio suite. Includes pulseaudio, pavucontrol, and pulseaudio-utils." "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" \ false "FORMS" "AmRRON Form templates will be downloaded." "Unknown" "Version 3" \ @@ -3083,7 +3109,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s rc=$? if [[ $rc == 2 ]]; then - radioArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL PULSE UBLOX FORMS) + radioArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMSTATX PULSE UBLOX FORMS) for i in "${radioArray[@]}" do @@ -3648,7 +3674,7 @@ rc=$? mkdir -p $USERDIR fi CONKYSEL=STANDARD - easyArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST ELECTRUM CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH GPA ICONS) + easyArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMSTATX PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST ELECTRUM CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH GPA ICONS) for i in "${easyArray[@]}" do @@ -3775,6 +3801,9 @@ cat /tmp/results | yad --text-info --center \ JS8CALL) js8call_install ;; + COMSTATX) + comstat_install + ;; UBLOX) ublox_gps_setup echo ublox >> /tmp/cleanup diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index d2ae91b..3fa10f0 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -182,7 +182,7 @@ fi ################# echo -echo "Checking on current versions of VARA and RMS Express" +echo "Checking on current versions of VARA HF and FM" echo VARAHFVER=$(curl -s https://rosmodem.wordpress.com/ | grep -m 1 "VARA HF" | awk -F "VARA HF" '{print $2}' | awk -F " " '{print $1}' | sed s/\ //g) diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index c4f9bcf..45c52c5 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,6 @@ +# Version 0.7.4.5 +- Added ComstatX for Mint installations + # Version 0.7.4.4 - Added sudo keepalive loop for mint installs