grrowl · October 22, 2019 00:51 · Oct 22, 2019 · Oct 22, 2019 · Jun 6, 2013 · Jun 6, 2013
diff --git a/portforward.sh b/portforward.sh
@@ -1,38 +1,20 @@
-function portforward() {
-  if [[ $# -ne 2 ]]
+#!/bin/bash
+
+if [[ $# -lt 2 ]]
+then
+  echo "Usage: port-forward HOST REMOTE_PORT [LOCAL_PORT]";
+else
+  HOST=$1
+  REMOTE_PORT=$2
+  LOCAL_PORT=${3:-${REMOTE_PORT}}
+
+  if ! [[ $(lsof -i :$LOCAL_PORT | grep COMMAND) ]]
   then
-    echo "Usage: portforward HOST PORT";
+    # Port is free, set up tunnel
+    echo "Forwarding to port $REMOTE_PORT on $HOST from http://localhost:$LOCAL_PORT"
+    ssh -f -L "$LOCAL_PORT:localhost:$REMOTE_PORT" "$HOST" -N 2> /dev/null
   else
-    HOST=$1
-    REMOTE_PORT=$2
-    # Pick a random port and check it is free
-    LOCAL_PORT=$((RANDOM+1000))
-    if ! [[ `lsof -i :$LOCAL_PORT | grep COMMAND` ]]
-    then
-      # Port is free - woop!
-      echo "Forwarding to port $REMOTE_PORT on $HOST from http://localhost:$LOCAL_PORT"
-      ssh -f -L $LOCAL_PORT:localhost:$REMOTE_PORT $HOST -N 2> /dev/null
-    else
-      # Recursion ftw
-      portforward $HOST $REMOTE_PORT
-    fi
+    # Call script again with new local port
+    "$0" "$HOST" "$REMOTE_PORT" $((RANDOM+1000))
   fi
-}
-
-# Used for autocompletion
-function _portforward() {
-  cur="${COMP_WORDS[COMP_CWORD]}"
-  if [[ ${COMP_WORDS[COMP_CWORD-1]} == "portforward" ]]
-  then
-    # the sed call is there to combat people like me who have "grep --color=always" on by default
-    hosts=$(grep "Host " ~/.ssh/config | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | grep -v "#" | grep -v "*" | awk '{print $2}')
-    COMPREPLY=($(compgen -W "${hosts}" -- ${cur}))
-  else
-    # otherwise assume on second arg, so autocomplete service name
-    ports="22 80 2222 3306 5432 8080 11211 55672 15672"
-    COMPREPLY=($(compgen -W "${ports}" -- ${cur}))
-  fi
-  return 0
-}
-
-complete -F _portforward portforward
+fi
diff --git a/portforward.sh b/portforward.sh
@@ -22,7 +22,6 @@ function portforward() {
 # Used for autocompletion
 function _portforward() {
   cur="${COMP_WORDS[COMP_CWORD]}"
-  # COMP_CWORD-1 = portforward, i.e. the name of this function, so autocomplete SSH host
   if [[ ${COMP_WORDS[COMP_CWORD-1]} == "portforward" ]]
   then
     # the sed call is there to combat people like me who have "grep --color=always" on by default

diff --git a/portforward.sh b/portforward.sh
@@ -30,7 +30,7 @@ function _portforward() {
     COMPREPLY=($(compgen -W "${hosts}" -- ${cur}))
   else
     # otherwise assume on second arg, so autocomplete service name
-    ports="5432 3306 55672 15672 8080"
+    ports="22 80 2222 3306 5432 8080 11211 55672 15672"
     COMPREPLY=($(compgen -W "${ports}" -- ${cur}))
   fi
   return 0

diff --git a/portforward.sh b/portforward.sh
@@ -2,24 +2,24 @@ function portforward() {
   if [[ $# -ne 2 ]]
   then
     echo "Usage: portforward HOST PORT";
-    exit;
-  fi
-  HOST=$1
-  REMOTE_PORT=$2
-  # Pick a random port and check it is free
-  LOCAL_PORT=$((RANDOM+1000))
-  if ! [[ `lsof -i :$LOCAL_PORT | grep COMMAND` ]]
-  then
-    # Port is free - woop!
-    echo "Forwarding to port $REMOTE_PORT on $HOST from http://localhost:$LOCAL_PORT"
-    ssh -f -L $LOCAL_PORT:localhost:$REMOTE_PORT $HOST -N 2> /dev/null
   else
-    # Recursion ftw
-    portforward $HOST $REMOTE_PORT
+    HOST=$1
+    REMOTE_PORT=$2
+    # Pick a random port and check it is free
+    LOCAL_PORT=$((RANDOM+1000))
+    if ! [[ `lsof -i :$LOCAL_PORT | grep COMMAND` ]]
+    then
+      # Port is free - woop!
+      echo "Forwarding to port $REMOTE_PORT on $HOST from http://localhost:$LOCAL_PORT"
+      ssh -f -L $LOCAL_PORT:localhost:$REMOTE_PORT $HOST -N 2> /dev/null
+    else
+      # Recursion ftw
+      portforward $HOST $REMOTE_PORT
+    fi
   fi
 }
-
-# Used for autocompletion	
+ 
+# Used for autocompletion
 function _portforward() {
   cur="${COMP_WORDS[COMP_CWORD]}"
   # COMP_CWORD-1 = portforward, i.e. the name of this function, so autocomplete SSH host
@@ -35,5 +35,5 @@ function _portforward() {
   fi
   return 0
 }
-
+ 
 complete -F _portforward portforward
diff --git a/portforward.sh b/portforward.sh
@@ -25,7 +25,7 @@ function _portforward() {
   # COMP_CWORD-1 = portforward, i.e. the name of this function, so autocomplete SSH host
   if [[ ${COMP_WORDS[COMP_CWORD-1]} == "portforward" ]]
   then
-    # the sed call is there to combat people like me who have "grep --color" on by default
+    # the sed call is there to combat people like me who have "grep --color=always" on by default
     hosts=$(grep "Host " ~/.ssh/config | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | grep -v "#" | grep -v "*" | awk '{print $2}')
     COMPREPLY=($(compgen -W "${hosts}" -- ${cur}))
   else

diff --git a/portforward.sh b/portforward.sh
@@ -25,6 +25,7 @@ function _portforward() {
   # COMP_CWORD-1 = portforward, i.e. the name of this function, so autocomplete SSH host
   if [[ ${COMP_WORDS[COMP_CWORD-1]} == "portforward" ]]
   then
+    # the sed call is there to combat people like me who have "grep --color" on by default
     hosts=$(grep "Host " ~/.ssh/config | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | grep -v "#" | grep -v "*" | awk '{print $2}')
     COMPREPLY=($(compgen -W "${hosts}" -- ${cur}))
   else

diff --git a/portforward.sh b/portforward.sh
@@ -0,0 +1,38 @@
+function portforward() {
+  if [[ $# -ne 2 ]]
+  then
+    echo "Usage: portforward HOST PORT";
+    exit;
+  fi
+  HOST=$1
+  REMOTE_PORT=$2
+  # Pick a random port and check it is free
+  LOCAL_PORT=$((RANDOM+1000))
+  if ! [[ `lsof -i :$LOCAL_PORT | grep COMMAND` ]]
+  then
+    # Port is free - woop!
+    echo "Forwarding to port $REMOTE_PORT on $HOST from http://localhost:$LOCAL_PORT"
+    ssh -f -L $LOCAL_PORT:localhost:$REMOTE_PORT $HOST -N 2> /dev/null
+  else
+    # Recursion ftw
+    portforward $HOST $REMOTE_PORT
+  fi
+}
+
+# Used for autocompletion	
+function _portforward() {
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  # COMP_CWORD-1 = portforward, i.e. the name of this function, so autocomplete SSH host
+  if [[ ${COMP_WORDS[COMP_CWORD-1]} == "portforward" ]]
+  then
+    hosts=$(grep "Host " ~/.ssh/config | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | grep -v "#" | grep -v "*" | awk '{print $2}')
+    COMPREPLY=($(compgen -W "${hosts}" -- ${cur}))
+  else
+    # otherwise assume on second arg, so autocomplete service name
+    ports="5432 3306 55672 15672 8080"
+    COMPREPLY=($(compgen -W "${ports}" -- ${cur}))
+  fi
+  return 0
+}
+
+complete -F _portforward portforward