diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 541d471..e5617ec 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1993,6 +1993,22 @@ sudo apt-mark hold js8call || rm /tmp/js8call* 2>/dev/null || { ERRCODE="Failed to delete js8call deb file"; errors; return; } +} + +function flmsgviewer_install() { + +if [[ -d "$USERDIR/flmsg-viewer" ]]; then + echo "Checking for update" && cd $USERDIR/flmsg-viewer && git pull || + { ERRCODE="Failed to run git pull for flmsg-viewer"; errors; return; } + +else + cd $USERDIR && git clone https://gitlab.com/amrron/flmsg-viewer.git || + { ERRCODE="Failed to clone flmsg-viewer"; errors; return; } +fi + + + + } function ublox_gps_setup() { @@ -2506,6 +2522,30 @@ if [[ ! -f $USERDIR/icons/commstat.jpg ]]; then fi +chmod +x $HOME/Desktop/*.desktop + +} + +if [[ -d "$USERDIR/flmsg-viewer" ]]; then + +echo "[Desktop Entry] +Name=FLMSG_Viewer +GenericName=FLMSG_Viewer +Comment=Viewer for FLMSG +Path=$USERDIR/flmsg-viewer/flmsgviewer3_8_Share +Exec=/usr/bin/python3 $USERDIR/flmsg-viewer/flmsgviewer3_8_Share/flmsgviewer.py +Icon=$USERDIR/flmsg-viewer/flmsgviewer3_8_Share/app_icon.png +Terminal=false +Type=Application +Categories=Radio;" > $HOME/Desktop/flmsgviewer.desktop || +{ ERRCODE="Failed to create desktop icon for flmsgviewer"; errors; } + +fi + + +fi + + chmod +x $HOME/Desktop/*.desktop } @@ -3600,7 +3640,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 ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL_2.2.0 PULSE UBLOX FORMS COMMSTATONE) + radioArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL_2.2.0 FLMSG_VIEWER PULSE UBLOX FORMS COMMSTATONE) for i in "${radioArray[@]}" do @@ -4172,7 +4212,7 @@ rc=$? mkdir -p $USERDIR fi CONKYSEL=STANDARD - easyArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL_2.2.0 PULSE UBLOX FORMS MINICOM GTKTERM QTTERMTCP 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 COMMSTATONE) + easyArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOPCF ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL_2.2.0 FLMSG_VIEWER PULSE UBLOX FORMS MINICOM GTKTERM QTTERMTCP 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 COMMSTATONE) for i in "${easyArray[@]}" do @@ -4314,6 +4354,9 @@ cat /tmp/results | yad --text-info --center \ JS8CALL_2.2.0) js8call_2.2.0_install ;; + FLMSG_VIEWER) + flmsgviewer_install + ;; COMMSTATONE) comstat_install ;; diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index e0e2421..a414bbd 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,5 @@ +# Version 1.2.6 +- Added FLMSG-Viewer # 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.