1 files changed, 18 insertions, 10 deletions

@@ -35,12 +35,15 @@ die() {
 
 demolish_tunnels() {
         printf '%s...' "Demolishing tunnels"
-        while read -r pid; do
-                [ -z "$pid" ] && continue
-                kill "$pid" 2>/dev/null
-        done <"$pidf"
-        rm "$pidf"
-        sleep 3
+        if [ -f "$pidf" ]; then
+                while read -r pid; do
+                        [ -z "$pid" ] && continue
+                        kill "$pid" 2>/dev/null
+                done <"$pidf"
+                rm "$pidf"
+        else
+                pkill -x ssh
+        fi
         printf '%s.\n' "Done"
 }
 
@@ -48,7 +51,7 @@ config="${XDG_CONFIG_HOME:=$HOME/.config}/mrgrctrnl/config"
 pidf=/tmp/mrgrctrnl.pid
 dry_run=false
 
-while getopts hc:dk opt; do
+while getopts hc:dkr opt; do
         case "$opt" in
         h) usage ;;
         c) config="$OPTARG" ;;
@@ -58,6 +61,11 @@ while getopts hc:dk opt; do
                 pkill -x mrgrctrnl
                 exit
                 ;;
+        r)
+                demolish_tunnels
+                exec mrgrctrnl
+                exit
+                ;;
         \?) usage 2 ;;
         *) usage 2 ;;
         esac
@@ -83,11 +91,11 @@ awk '{sub(/#.*$/,"");print}' "$config" |
 
                 echo ssh "$@"
 
+                touch "$pidf"
                 "$dry_run" || {
-                        while :; do
-                                ssh "$@"
+                        while [ -f "$pidf" ]; do
+                                ssh "$@" || break
                                 echo "$!" >>"$pidf"
-                                sleep 5
                         done &
                 }
         done