Make it2ssh work on Ubuntu 18, Ubuntu 20, and macOS remote hosts

Author: gnachman

ssh-helpers/conductor.sh

@@ -244,18 +244,21 @@ conductor_cmd_runpython() {
 really_run_python() {
   log really_run_python
   unset RCOUNT
+  ttypath=$(tty)
+  log "tty is $ttypath"
   exec python3 << ENDOFSCRIPT
 import os
 import sys
-tty_path = os.ttyname(sys.stdout.fileno())
+tty_path = "$ttypath"
 sys.stdin = open(tty_path, "r")
 try:
-  print(f"\033]135;:{os.getpid()}\033\\\033]135;:end $boundary r 0\033\\\\", end="", flush=True)
+  print(f"\\033]135;:{os.getpid()}\\033\\\\", end="", flush=True)
+  print(f"\\033]135;:end $boundary r 0\\033\\\\", end="", flush=True)
   program=""
   for line in sys.stdin:
     if line.rstrip() == "EOF":
       exec(program)
-      print(f"\033]135;:unhook\033\\\\", end="", flush=True)
+      print(f"\\033]135;:unhook\\033\\\\", end="", flush=True)
       break
     program += line
 except Exception as e:

utilities/it2ssh

@@ -147,7 +147,8 @@ fi
 send_conductor='printf "\033]1337;SendConductor'"$st"'"'
 
 # Run a command on the remote host that instructs iTerm2 to send a script, then reads the script and executes it.
-sanitized="$send_conductor"';s="";IFS=""; stty -echo; while read -r l;do [ "$l" = EOF ]&&break; s="$s$l\n"; done; unset IFS; eval "$s"'
+# I tried many ways to concatenate s and l and this is the only one that works on both Ubuntu 18 and Ubuntu 20.
+sanitized="$send_conductor"';s="";IFS=""; stty -echo; while read -r l;do [ "$l" = EOF ]&&break; s=$(printf "%s\n%s" "$s" "$l"); done; unset IFS; eval "$s"'
 
 # If ssh gets a signal, let it2ssh keep running.
 set +e