ssh-and-tmux: on successful ssh exit, exit script

1 files changed, 7 insertions, 1 deletions

diff --git a/bin/ssh-and-tmux b/bin/ssh-and-tmux
index 1aca3efc..cd66ecc2 100755
--- a/bin/ssh-and-tmux
+++ b/bin/ssh-and-tmux
@@ -72,12 +72,18 @@ fi
 if $use_mosh; then
     mosh "$host" -- "${cmd[@]}"
 else
+    # The idea behind quitting on d, C-c or C-d was so that the user can type
+    # C-d C-d to kill the remote shell and then kill this script, C-\ d d to
+    # detach tmux and then kill this script, or similar.
+    #
+    # We now die when ssh exits zero, so this feature may be obsolete.
+
     echo -ne "\033]0;tmux $session on $display_host\007"
     prompt="Press any key to reconnect to tmux session $session on "
     prompt+="$display_host; d/C-d/C-c to give up .."
 
     while true; do
-	ssh -t "$host" "${cmd[*]}"
+	ssh -t "$host" "${cmd[*]}" && exit
 	clear
 	read -n 1 -r -s -p "$prompt" ch
 	[ "$ch" = $'\04' -o "$ch" = d ] && echo && exit