From de6df6452ef9ed10225573bbbaa7f26bed320062 Mon Sep 17 00:00:00 2001
From: edsai <ed@twentybelow.com>
Date: Mon, 2 Mar 2020 20:00:14 -0500
Subject: [PATCH] Moved variables out to fix process checking

---
 tunnel.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/tunnel.sh b/tunnel.sh
index 3c56452..0049373 100755
--- a/tunnel.sh
+++ b/tunnel.sh
@@ -12,10 +12,6 @@
 
 
 #!/bin/bash
-createTunnel() {
-#Definitions
-# Originating Side = the host that runs this script that connects to a remote side and creates a tunnel back to itself
-# remote side - the tunnel host.
 
 keyFilePath="" #path to private key identity file
 SSHremotePort="22" #remote side SSH service port. Normally 22, change if different
@@ -23,9 +19,14 @@ SSHTunnelPort="2222" #remote side port that the tunnel will be bound to (think h
 SSHlocalPort="22" #port where SSH runs on the originating side (normally 22, change if different)
 identity="username@host" #username and IP/host of remote side 
 
- # This command will create a tunnel on the remote side, bound to the remote side *localhost only* to the SSHTunnelPort.  
- # on the remote side it can be accessed by: /usr/bin/ssh -l username -p 2222 localhost (where username is a user on the originating system)
- # this will connect back to the originating side SSH service and present you with a login prompt or accept your key and log you in.
+createTunnel() {
+#Definitions
+# Originating Side = the host that runs this script that connects to a remote side and creates a tunnel back to itself
+# remote side - the tunnel host.
+
+# This command will create a tunnel on the remote side, bound to the remote side *localhost only* to the SSHTunnelPort.  
+# on the remote side it can be accessed by: /usr/bin/ssh -l username -p 2222 localhost (where username is a user on the originating system)
+# this will connect back to the originating side SSH service and present you with a login prompt or accept your key and log you in.
 
  /usr/bin/autossh -i "$keyFilePath" -p "$SSHremotePort" -N -R "$SSHTunnelPort":localhost:"$SSHlocalPort" "$identity"
   if [[ $? -eq 0 ]]; then
@@ -35,9 +36,11 @@ identity="username@host" #username and IP/host of remote side
   fi
 }
 
-PROCESS_NUM=$(ps -ef |grep "2222\:localhost\:703" |wc -l)
+PROCESS_NUM=$(ps -ef |grep "$SSHTunnelPort\:localhost\:$SSHlocalPort" |wc -l)
 if [ "$PROCESS_NUM" == "0" ]; then
   echo Creating new tunnel connection...
   createTunnel
+  echo Tunnel created...
+else
   echo Tunnel already active...
-fi
+fi
\ No newline at end of file