Add key and rest fields and improve ssh calls

1 files changed, 8 insertions, 3 deletions

@@ -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 &