Add key and rest fields and improve ssh calls

2 files changed, 16 insertions, 5 deletions

@@ -33,10 +33,16 @@ with whitespace-separeted fields.
 A `#` begins a comment that goes to the end of the line.
 
 ```
-# machine       user    local           remote
-example.com     ted     localhost:6989  localhost:6667
+# machine    user local           remote          key               rest
+example.com  ted  localhost:6989  localhost:6667  /path/to/key.pub  [..]
 ```
 
+**machine**, **user**, **local**, and **remote** are required.
+**key** and **rest** are optional.
+
+**rest** is more command-line options, if there's anything else you'd like to
+include in the command.
+
 ## Requirements
 
 - POSIX environment
@@ -70,19 +70,24 @@ then demolish_tunnels
 fi
 
 awk '{sub(/#.*$/,"");print}' "$config" |
-while read -r machine user local remote
+while read -r machine user local remote key rest
 do
         if [ -z "$machine" ] || [ -z "$user" ] || 
                 [ -z "$local" ] || [ -z "$remote" ]
         then continue
         fi
 
-        echo ssh -N "$user@$machine" -L "$local:$remote"
+        set -- -N "$user@$machine" -L "$local:$remote"
+        [ -n "$key" ] && set -- "$@" -i "$key"
+        #shellcheck disable=2086
+        [ -n "$rest" ] && set -- "$@" $rest
+
+        echo ssh "$@"
 
         "$dry_run" || {
                 while :
                 do
-                        ssh -N "$user@$machine" -L "$local:$remote"
+                        ssh "$@"
                         echo "$!" >> "$pidf"
                         sleep 5
                 done &