From c63c45cb361aeca388f7782d5c5b644a537413ea Mon Sep 17 00:00:00 2001
From: Gordon Grant-Stuart <gordon@grant-stuart.com>
Date: Tue, 29 Nov 2022 15:44:32 +0000
Subject: [PATCH] More debuggery.

---
 tunnelkeeper | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/tunnelkeeper b/tunnelkeeper
index 29a75e6..4ee0f92 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -3,8 +3,6 @@
 REALPATH="$(realpath $0)"
 BASEDIR="${REALPATH%/*}"
 
-dev='/dev/null'
-
 mkdir -p "$BASEDIR/var"
 mkdir -p "$BASEDIR/etc"
 CONFFILE="$BASEDIR/etc/tunnels.conf"
@@ -24,30 +22,16 @@ function ruroot () {
 if [[ "${2}" == "--debug" ]]; then
   dev=$(tty)
   echo "debug enabled on $dev" > $dev
+else
+  dev='/dev/null'
 fi
 
-
 case "$1" in
   FORKSTART )
-    # if [[ "${2}" == "COUNTLOOPPROCESS" ]]; then # This process loops and keeps the service active
-    #   while true; do
-    #     if [[ $(find "$BASEDIR/var/" -name '*.connected' | wc -l) -eq 0 ]]; then
-    #       rm "$BASEDIR/var/tunnelkeeper.pid"
-    #     else
-    #       echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
-    #     fi
-    #     sleep 10
-    #   done
-    # else # This process connects the tunnel
-    #   touch "$BASEDIR/var/${2}.connected"
-    #   while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
-    #     ssh -F $CONFFILE -N $2 &> $dev
-    #     sleep 5
-    #   done
-    # fi
+    [[ "$3" != "/dev/null" ]] && vvv='-vvv' || vvv='' # debug mode
     touch "$BASEDIR/var/${2}.connected"
     while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
-      ssh -F $CONFFILE -N $2 &> $3
+      ssh -F $vvv "${CONFFILE}" -N $2 &> $3
       sleep 5
     done
   ;;