From 86863daf28dab6eede85718cbdba2ef7c58da75a Mon Sep 17 00:00:00 2001
From: KM4ACK <jason.oleham@gmail.com>
Date: Wed, 20 May 2020 07:47:30 -0500
Subject: [PATCH 1/5] see changelog

---
 catalog     | 17 ++++++-----------
 changelog   |  7 ++++++-
 manage-menu |  8 ++++----
 manage-pat  | 18 +++++++++---------
 patmenu     | 23 +++++++++--------------
 5 files changed, 34 insertions(+), 39 deletions(-)

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="<b>Pat Catalog</b> 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="<b>Pat Menu Settings/Config</b> 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="<b>Manage Pat</b> 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="<b>Pat Menu</b> 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
 

From 134c0aa526d2831e1f32c6ca1b62bf66f3305b4a Mon Sep 17 00:00:00 2001
From: KM4ACK <jason.oleham@gmail.com>
Date: Wed, 20 May 2020 08:49:21 -0500
Subject: [PATCH 2/5] update

---
 changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 1ea3c4d..5af1ee2 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,11 @@
 
 
-release=2.0.1
+release=2.1.0
 
 
 Changelog
-2.0.1	update path in manage-menu
+2.1.0	add delete config feature
+	update path in manage-menu
 	update path in patmenu
 	update path in catalog
 	update path in manage-pat

From 41818702023b794214cd677eca96e861c8ffa475 Mon Sep 17 00:00:00 2001
From: KM4ACK <jason.oleham@gmail.com>
Date: Wed, 20 May 2020 08:49:37 -0500
Subject: [PATCH 3/5] add delete config

---
 manage-menu | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manage-menu b/manage-menu
index 98b464b..316e984 100755
--- a/manage-menu
+++ b/manage-menu
@@ -12,6 +12,7 @@ yad --form --width=420 --text-align=center --center --title="Settings" --text-al
 --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"' \
+--field="Delete Config File":fbtn 'bash -c "kill -USR1 $YAD_PID; source $MYPATH/manage-menu-functions; DELETECONFIG"' \
 --button="Main Menu":1
 BUT=$?
 

From 6a0ba48e2614313fecec9152609a2deb9918ba8f Mon Sep 17 00:00:00 2001
From: KM4ACK <jason.oleham@gmail.com>
Date: Wed, 20 May 2020 08:49:50 -0500
Subject: [PATCH 4/5] add delete config

---
 manage-menu-functions | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/manage-menu-functions b/manage-menu-functions
index 056ada0..7c00741 100644
--- a/manage-menu-functions
+++ b/manage-menu-functions
@@ -238,7 +238,44 @@ exit
 fi
 }
 
-
+DELETECONFIG(){
+TEMPFILE=$MYPATH/config.tmp
+
+FILES=$(ls $MYPATH | grep .config)
+
+echo $FILES | awk 'BEGIN { OFS = "\n" }{ print $1, $2, $3, $4, $5, $6, $7, $8, $9, $10 }' > $TEMPFILE
+
+CONFIG=$(PARSER='OFS="\n" {print $1}'
+
+tail -50 $TEMPFILE | awk "$PARSER" | \
+yad --title="Config Delete" --width=1100 --height=500 --separator=" " --item-separator="|" \
+    --image $LOGO --window-icon=$LOGO --image-on-top \
+    --center --list --text="Config Delete" \
+    --column Config-Files \
+    --button=gtk-close \
+    --button="Delete Config":2)
+BUT=$?
+
+if [ $BUT = 0 ]; then
+$MAIN &
+exit
+elif [ $BUT = 252 ]; then
+exit
+fi
+FILE=$(echo $CONFIG | awk -F "|" '{print $1}')
+rm $MYPATH/$FILE
+
+rm $TEMPFILE
+
+yad --title="Deleted" --width=400 --height=100 \
+    --image $LOGO --window-icon=$LOGO --image-on-top --text-align=center \
+    --center --form --text="$FILE has been deleted" \
+    --button=gtk-ok
+
+$MAIN & 
+exit
+
+}
 
 
 

From ab53950fafce6334258aa7d7b5b5351e3c6936bb Mon Sep 17 00:00:00 2001
From: KM4ACK <jason.oleham@gmail.com>
Date: Wed, 20 May 2020 08:52:30 -0500
Subject: [PATCH 5/5] rm temp when done

---
 manage-menu-functions | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manage-menu-functions b/manage-menu-functions
index 7c00741..1ae7a7f 100644
--- a/manage-menu-functions
+++ b/manage-menu-functions
@@ -258,12 +258,13 @@ BUT=$?
 
 if [ $BUT = 0 ]; then
 $MAIN &
+rm $TEMPFILE
 exit
 elif [ $BUT = 252 ]; then
+rm $TEMPFILE
 exit
 fi
 FILE=$(echo $CONFIG | awk -F "|" '{print $1}')
-rm $MYPATH/$FILE
 
 rm $TEMPFILE