From c8ae664ac0ffcc07257ef75a6c20fb4164772721 Mon Sep 17 00:00:00 2001
From: Gordon Grant-Stuart <gordon@grant-stuart.com>
Date: Tue, 31 Jan 2023 10:51:26 +0000
Subject: [PATCH] asdf

---
 tunnelkeeper | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tunnelkeeper b/tunnelkeeper
index 6a7e786..1b9251a 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -21,7 +21,7 @@ function ruroot () {
   fi
 }
 
-DEBUGLEVEL=$(awk '/^debug/ {print $2}' $TKCONF)
+DEBUGLEVEL=$(awk '/^debug/ {print $2}' $TKCONF &>/dev/null)
 case "$DEBUGLEVEL" in
   2) dbgopt='-v';;
   3) dbgopt='-vvv';;
@@ -58,6 +58,7 @@ case "$1" in
         sleep 5
       done
     fi
+    exit
   ;;
   FORKSCREEN )
     while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
@@ -65,20 +66,23 @@ case "$1" in
       # ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg
       connect $2
     done
+    exit
   ;;
-  FORKDEL ) rm "$BASEDIR/var/${2}.connected" ;;
-  FORKKILL ) pkill -f '#tunnelkeeper' &>/dev/null ;;
+  # FORKDEL ) rm "$BASEDIR/var/${2}.connected"; exit ;;
+  # FORKKILL ) pkill -f '#tunnelkeeper' &>/dev/null; exit ;;
   start)
     [[ -e "$BASEDIR/var/tunnelkeeper.pid" ]] && exit
     echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
     cat "$SSHCONF" | awk '/^Host / {print $2}' | xargs -I% -P0 $0 FORKSTART % &
   ;;
-  stop)
-    rm "$BASEDIR/var/tunnelkeeper.pid"
-    cat "$SSHCONF" | awk '/^Host / {print $2}' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL %
-    cat "$SSHCONF" | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL %
+  stop )
+    rm -f "$BASEDIR/var/tunnelkeeper.pid"
+    rm -f "$BASEDIR/var/*.connected"
+    pkill -f '#tunnelkeeper' &>/dev/null
+    # cat "$SSHCONF" | awk '/^Host / {print $2}' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL %
+    # cat "$SSHCONF" | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL %
   ;;
-  restart) 
+  restart ) 
     if systemctl status tunnelkeeper &>/dev/null; then
       systemctl restart tunnelkeeper
     else