From 0d73fb3da5eff8f59cd1b20cebd8a96045078f33 Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Thu, 18 Jun 2020 13:48:29 +0100
Subject: [PATCH] menu: fix yg logs with correct path, exit to scripts dir

---
 scripts/menu.sh    |  1 +
 scripts/menu.yg.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/menu.sh b/scripts/menu.sh
index a6beb5a..c45dda6 100755
--- a/scripts/menu.sh
+++ b/scripts/menu.sh
@@ -136,6 +136,7 @@ case $CHOICE in
             /home/joinmarket/menu.sh
             ;;
         X)
+            cd /home/joinmarket/joinmarket-clientserver/scripts/
             clear
             echo "***********************************"
             echo "* JoininBox Commandline"
diff --git a/scripts/menu.yg.sh b/scripts/menu.yg.sh
index 808c076..5a6efe7 100755
--- a/scripts/menu.yg.sh
+++ b/scripts/menu.yg.sh
@@ -90,10 +90,11 @@ Will tail the latest YG logfile from:
 /home/joinmarket/.joinmarket/logs/
 
 Press CTRL+C to exit and return to the menu." 10 50
-
-            ls -t /home/joinmarket/.joinmarket/logs | grep J5 | head -n 1 | xargs tail -fn1000
+            cd /home/joinmarket/.joinmarket/logs 
+            ls -t | grep J5 | head -n 1 | xargs tail -fn1000
             echo "Press ENTER to return to menu"
             read key
+            cd /home/joinmarket/joinmarket-clientserver/scripts/
             /home/joinmarket/menu.sh
             ;;            
         STOP)
@@ -108,8 +109,7 @@ Press CTRL+C to exit and return to the menu." 10 50
             # sudo systemctl list-units --type=service
             sudo systemctl reset-failed
             echo "Stopped the Yield Generator background service"
-            echo "Returning to the menu..."
-            sleep 1
-            /home/joinmarket/menu.sh
+            echo "Press ENTER to return to the menu..."
+            read key
             ;;
 esac
\ No newline at end of file