From a600dce1b02be5d2792cd1c5b7f3a2903df31e18 Mon Sep 17 00:00:00 2001 From: tb14 Date: Tue, 14 Jan 2025 10:47:46 -0600 Subject: [PATCH] more automation for commstatone install mint 22 --- AmRRON-Setup-Script.sh | 64 +++++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index c729d7c..3012e6d 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1781,6 +1781,9 @@ if [[ $OSCN =~ una|vanessa|vera|virginia|wilma ]]; then cd $USERDIR && git clone https://github.com/W5DMH/commstatone.git || { ERRCODE="Failed to download comstat archive"; errors; return; } +cd $USERDIR/commstatone && chmod +x linuxinstall.sh || +{ ERRCODE="Failed to make linuxinstall.sh executable."; errors; return; } + echo comstatone >> /tmp/cleanup else echo "Comstat install has not been tested on your distribution." @@ -1792,6 +1795,9 @@ if [[ $OSCN = wilma ]]; then cd ~/Radio/commstatone && sudo apt install -y python3.12-venv || { ERRCODE="Failed to install python3.12-venv virtual environment dependencies"; errors; return; } +#sed -i -e '110d' install.py || +#{ ERRCODE="Failed to remove Start Settings line from install.py IOT allow for automated install."; errors; return; } + python3 -m venv venv || { ERRCODE="Failed to create python virtual environment"; errors; return; } @@ -1804,8 +1810,41 @@ pip3 install pyqt5 || pip3 install pyqtwebengine || { ERRCODE="Failed to download pyqtwebengine dependency"; errors; return; } + + fi + +if [[ -f $USERDIR/commstatone/commstat.py ]]; then + + if [[ OSCN = wilma ]]; then +echo "[Desktop Entry] +Name=CommstatOne +GenericName=CommstatOne +Comment=Commstat JS8 SA Tool +Path=$USERDIR/commstatone/ +Exec=$USERDIR/commstatone/venv/bin/python3 commstat.py +Icon=$USERDIR/icons/commstat.jpg +Terminal=false +Type=Application +Categories=Radio;" > $HOME/Desktop/commstat.desktop || +{ ERRCODE="Failed to create desktop icon for CommstatOne"; errors; } + + else +echo "[Desktop Entry] +Name=CommstatOne +GenericName=CommstatOne +Comment=Commstat JS8 SA Tool +Path=$USERDIR/commstatone/ +Exec=python3 commstat.py +Icon=$USERDIR/icons/commstat.jpg +Terminal=false +Type=Application +Categories=Radio;" > $HOME/Desktop/commstat.desktop || +{ ERRCODE="Failed to create desktop icon for CommstatOne"; errors; } + fi + + } @@ -3417,7 +3456,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" "Unknown" \ + false "COMMSTATONE" "JS8Call mapping (Mint only)" "Unknown" "Unknown" \ 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 5.0 / 5.1" \ @@ -3425,7 +3464,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s rc=$? if [[ $rc == 2 ]]; then - radioArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMSTATX PULSE UBLOX FORMS) + radioArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMMSTATONE PULSE UBLOX FORMS) for i in "${radioArray[@]}" do @@ -3994,7 +4033,7 @@ rc=$? mkdir -p $USERDIR fi CONKYSEL=STANDARD - easyArray=(HAMLIB4.5.5 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 CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS) + easyArray=(HAMLIB4.5.5 FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMMSTATONE PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS) for i in "${easyArray[@]}" do @@ -4130,7 +4169,7 @@ cat /tmp/results | yad --text-info --center \ JS8CALL) js8call_install ;; - COMSTATX) + COMMSTATONE) comstat_install ;; UBLOX) @@ -4337,26 +4376,25 @@ ARDOP_GUI on a 64bit OS prior to Mint 19+ and Ubuntu 18.04+" comstatone) TITLE="ComstatONE Downloaded" TEXT="ComstatONE has been downloaded but requires manual installation for now. \ -MINT 21.3: Please navigate to your Radio directory and enter the commstatone directory. Type 'chmod +x linuxinstall.sh' \ -to make the installation script executable and then run the script with './linuxinstall.sh'. After installation, \ +MINT 21.3: Please navigate to your Radio directory and enter the commstatone directory. \ +Run the script with './linuxinstall.sh'. After installation, \ type python commstat.py or python3 commstat.py from the installaion directory or use the desktop launcher. \ -MINT 22: I'll be working on this soon to automate but for now you need to create a virtual python environment.\ -I'll place a help file in your setup-scripts/Files directory with this information. +MINT 22: This script should have created your python virtual environment. You will need to execute the following to complete install. cd ~/Radio/commstatone - python3 -m venv venv source venv/bin/activate - pip3 install pyqt5 - pip3 install pyqtwebengine ./linuxinstall.sh - To Run next time: cd ~/Radio/commstatone + To Run next time use the desktop shortcut or: + cd ~/Radio/commstatone source /venv/bin/activate python3 commstat.py -You will need to provide the path to you DIRECTED.TXT file of JS8Call. Setup JS8Call first then determine the location of the DIRECTED.TXT file for your installation. " + +You will need to provide the path to you DIRECTED.TXT file of JS8Call. Default should be $HOME/.local/share/JS8Call \ +Setup JS8Call first then determine the location of the DIRECTED.TXT file for your installation. " cleanupyad ;;