ssh-and-tmux: fix '-c $HOME' when attaching to containers

1 files changed, 11 insertions, 7 deletions

diff --git a/bin/ssh-and-tmux b/bin/ssh-and-tmux
index cd66ecc2..2d9f683d 100755
--- a/bin/ssh-and-tmux
+++ b/bin/ssh-and-tmux
@@ -49,25 +49,29 @@ session="${2:-default}"
 if printf '%s\0' "${mosh_hosts[@]}" \
 	| grep -Fxqz "$host"; then use_mosh=true; else use_mosh=false; fi
 
+if [ -n "$container_name" ]; then
+    home="\\\$HOME"
+    display_host="$container_name"
+else
+    home="\$HOME"
+    display_host="$host"
+fi
+
 # Go via a login shell such that if there is no root tmux daemon yet, it ends
 # up with a PATH as though the first tmux session were launched from an
 # interactive shell.  This affects launching programs directly from tmux
 # (e.g. my C-\ e binding) for *all* sessions.
 #
 # mosh does execvp directly so for simplicity we assume remote SHELL is bash.
-cmd="tmux new-session -A -c \$HOME -s $session"
+cmd=$(printf "tmux new-session -A -c %s -s $session" $home)
 if $use_mosh; then
     cmd=(bash -l -c "$cmd")
 else
     cmd=(\$SHELL -l -c "\"$cmd\"")
 fi
 
-if [ -n "$container_name" ]; then
-    display_host="$container_name"
-    cmd=($(printf "$container_cmd" "$container_name") -- "${cmd[@]}")
-else
-    display_host="$host"
-fi
+[ -n "$container_name" ] \
+    && cmd=($(printf "$container_cmd" "$container_name") -- "${cmd[@]}")
 
 if $use_mosh; then
     mosh "$host" -- "${cmd[@]}"