diff --git a/catalog b/catalog index bf7631f..efa8757 100755 --- a/catalog +++ b/catalog @@ -4,13 +4,8 @@ #20200427 KM4ACK #side note: written during covid-19 outbreak of 2020 -#######DEV NOTES############# -############################# - -############################# - -MYPATH=$HOME/patmenu2 +export MYPATH=$HOME/patmenu2 LOGO=$MYPATH/pmlogo.png MAIN=$MYPATH/./patmenu @@ -18,11 +13,11 @@ MAIN=$MYPATH/./patmenu yad --form --width=420 --text-align=center --center --title="Pat Catalog" --text-align=center \ --image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ --text="Pat Catalog by KM4ACK" \ ---field="Gateway List":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/cat-functions; GATEWAY"' \ ---field="Weather Reports":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/cat-functions; WEATHER"' \ ---field="Position Reports":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/cat-functions; POSITION"' \ ---field="Propagation Reports":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/cat-functions; PROPAGATION"' \ ---field="News Reports":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/cat-functions; NEWS"' \ +--field="Gateway List":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/cat-functions; GATEWAY"' \ +--field="Weather Reports":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/cat-functions; WEATHER"' \ +--field="Position Reports":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/cat-functions; POSITION"' \ +--field="Propagation Reports":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/cat-functions; PROPAGATION"' \ +--field="News Reports":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/cat-functions; NEWS"' \ --button="Main Menu":1 QUIT=$? diff --git a/changelog b/changelog index e939fdf..1ea3c4d 100644 --- a/changelog +++ b/changelog @@ -1,9 +1,14 @@ -release=2.0.0 +release=2.0.1 Changelog +2.0.1 update path in manage-menu + update path in patmenu + update path in catalog + update path in manage-pat + various script cleanup to remove notes 2.0.0 Hey!! Where is version 1? Here's the scoop, there is no version 1. We never made it to version 1 before I did a major overhaul of the diff --git a/manage-menu b/manage-menu index b390260..98b464b 100755 --- a/manage-menu +++ b/manage-menu @@ -1,6 +1,6 @@ #!/bin/bash -MYPATH=$HOME/patmenu2 +export MYPATH=$HOME/patmenu2 LOGO=$MYPATH/pmlogo.png source $MYPATH/manage-menu-functions MAIN=$MYPATH/patmenu @@ -9,9 +9,9 @@ MAIN=$MYPATH/patmenu yad --form --width=420 --text-align=center --center --title="Settings" --text-align=center \ --image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ --text="Pat Menu Settings/Config by KM4ACK" \ ---field="Current Config Settings":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-menu-functions; CURRENTCONFIG"' \ ---field="Create New Config File":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-menu-functions; NEWCONFIG"' \ ---field="Load Config File":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-menu-functions; LOADCONFIG"' \ +--field="Current Config Settings":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-menu-functions; CURRENTCONFIG"' \ +--field="Create New Config File":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-menu-functions; NEWCONFIG"' \ +--field="Load Config File":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-menu-functions; LOADCONFIG"' \ --button="Main Menu":1 BUT=$? diff --git a/manage-pat b/manage-pat index 0c20ee3..705d136 100755 --- a/manage-pat +++ b/manage-pat @@ -1,6 +1,6 @@ #!/bin/bash -MYPATH=$HOME/patmenu2 +export MYPATH=$HOME/patmenu2 LOGO=$MYPATH/pmlogo.png source $MYPATH/manage-pat-functions MAIN=$MYPATH/patmenu @@ -9,14 +9,14 @@ MAIN=$MYPATH/patmenu yad --form --width=420 --text-align=center --center --title="Manage Pat" --text-align=center \ --image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ --text="Manage Pat by KM4ACK" \ ---field="Pat Login-Logout":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-pat-functions; LOGIN"' \ ---field="GPS Grid Update":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-pat-functions; GPSGRID"' \ ---field="Set ARDOP Speed":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-pat-functions; SPEED"' \ ---field="Delete Alias":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-pat-functions; DELETEALIAS"' \ ---field="Backup Emails":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-pat-functions; EMAILBKUP"' \ ---field="Restore Emails":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-pat-functions; EMAILRESTORE"' \ ---field="Backup Pat Config":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-pat-functions; BKUPCONFIG"' \ ---field="Restore Pat Config":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/manage-pat-functions; RESTORECONFIG"' \ +--field="Pat Login-Logout":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; LOGIN"' \ +--field="GPS Grid Update":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; GPSGRID"' \ +--field="Set ARDOP Speed":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; SPEED"' \ +--field="Delete Alias":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; DELETEALIAS"' \ +--field="Backup Emails":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; EMAILBKUP"' \ +--field="Restore Emails":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; EMAILRESTORE"' \ +--field="Backup Pat Config":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; BKUPCONFIG"' \ +--field="Restore Pat Config":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-pat-functions; RESTORECONFIG"' \ --button="Main Menu":1 BUT=$? diff --git a/patmenu b/patmenu index 6eb9693..8421689 100755 --- a/patmenu +++ b/patmenu @@ -4,13 +4,8 @@ #20200427 KM4ACK #side note: written during covid-19 outbreak of 2020 -#######DEV NOTES############# -############################# - -############################# - -MYPATH=$HOME/patmenu2 +export MYPATH=$HOME/patmenu2 LOGO=$MYPATH/pmlogo.png MAIN=$MYPATH/./patmenu VERSION=$(cat $MYPATH/changelog | grep release | head -1 | sed 's/release=//') @@ -27,14 +22,14 @@ fi yad --form --width=420 --text-align=center --center --title="Pat Menu" --text-align=center \ --image $LOGO --window-icon=$LOGO --image-on-top --separator="|" --item-separator="|" \ --text="Pat Menu by KM4ACK\rv$VERSION" \ ---field="Start ARDOP Modem":fbtn 'bash -c "/home/pi/patmenu2/start-pat-ardop"' \ ---field="Start Packet Modem":fbtn 'bash -c "/home/pi/patmenu2/start-pat2m"' \ ---field="Stop Modems":fbtn 'bash -c "/home/pi/patmenu2/stop-modems"' \ ---field="Find Winlink Gateways":fbtn 'bash -c "kill -USR1 $YAD_PID; /home/pi/patmenu2/find2"' \ ---field="Pat Auto Connect":fbtn 'bash -c "kill -USR1 $YAD_PID; source /home/pi/patmenu2/pat-functions; AUTOPAT"' \ ---field="Pat Catalog":fbtn 'bash -c "kill -USR1 $YAD_PID; /home/pi/patmenu2/catalog"' \ ---field="Manage Pat Winlink":fbtn 'bash -c "kill -USR1 $YAD_PID; /home/pi/patmenu2/manage-pat"' \ ---field="Settings/Config":fbtn 'bash -c "kill -USR1 $YAD_PID; /home/pi/patmenu2/manage-menu"' \ +--field="Start ARDOP Modem":fbtn 'bash -c "$MYPATH/start-pat-ardop"' \ +--field="Start Packet Modem":fbtn 'bash -c "$MYPATH/start-pat2m"' \ +--field="Stop Modems":fbtn 'bash -c "$MYPATH/stop-modems"' \ +--field="Find Winlink Gateways":fbtn 'bash -c "kill -USR1 $YAD_PID; $MYPATH/find2"' \ +--field="Pat Auto Connect":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/pat-functions; AUTOPAT"' \ +--field="Pat Catalog":fbtn 'bash -c "kill -USR1 $YAD_PID; $MYPATH/catalog"' \ +--field="Manage Pat Winlink":fbtn 'bash -c "kill -USR1 $YAD_PID; $MYPATH/manage-pat"' \ +--field="Settings/Config":fbtn 'bash -c "kill -USR1 $YAD_PID; $MYPATH/manage-menu"' \ --field="My Call - $MYCALLSIGN":LBL \ --button="QUIT":1