new ssh-and-tmux and ssh-and-tmux-term and some connecting up

1 files changed, 2 insertions, 6 deletions

diff --git a/bin/debian-ftp-master b/bin/debian-ftp-master
index 8f454fac..6694ec24 100755
--- a/bin/debian-ftp-master
+++ b/bin/debian-ftp-master
@@ -57,10 +57,7 @@ ssh ftp-master.debian.org pgrep -u spwhitton emacs \
 #     sleep 0.3
 # done
 
-# have to say the '&' else on buster, command does not exit until
-# terminal window is closed
-xfce4-terminal --title="ftp-master dak command session" -x /bin/sh \
-               -c "ssh -t ftp-master.debian.org tmux new-session -A -s dak" &
+ssh-and-tmux-term ftp-master.debian.org dak "ftp-master dak command session"
 until wmctrl -l | grep -q "ftp-master dak command session"; do
     sleep 0.3
 done
@@ -71,8 +68,7 @@ wmctrl -R "ftp-master dak command session"
 # container on buster's i3 (but not stretch's)
 i3-msg layout tabbed
 
-xfce4-terminal --title="ftp-master GNU mc session" -x /bin/sh \
-               -c "ssh -t ftp-master.debian.org tmux new-session -A -s mc" &
+ssh-and-tmux-term ftp-master.debian.org mc "ftp-master GNU mc session"
 until wmctrl -l | grep -q "ftp-master GNU mc session"; do
     sleep 0.3
 done