make tty work with new hack

1 files changed, 33 insertions, 8 deletions

diff --git a/src/rpc.bash b/src/rpc.bash
index 44f7020..5e39851 100644
--- a/src/rpc.bash
+++ b/src/rpc.bash
@@ -66,7 +66,7 @@ bash_rpc_remote_run_script()
                 "$SHELL" -c "${script@Q}" "$0" "${@@Q}"
 }
 
-with_ssh_option()
+bash_rpc_with_ssh_option()
 {
         local BASH_RPC_SSH_OPTIONS
         BASH_RPC_SSH_OPTIONS+=("$1")
@@ -87,7 +87,7 @@ bash_rpc_eval_stdin()
         eval "unset REPLY; $(cat <<< "$REPLY")"
 }
 
-remote_run_function_simple()
+bash_rpc_run_function_simple()
 {
         script_source=$(declare -f "$1" && printf '"$@";\n')
         bash_rpc_remote_run_script  \
@@ -95,24 +95,49 @@ remote_run_function_simple()
                 "$@"
 }
 
-remote_run_function()
+remote_run_function_notty()
 {
         main=$1
         funcs=$(recursive_dependencies "$main")
         stage2_source=$(
                 declare -f $funcs
-                printf '"$@"\n' "$main"
+                printf '"$@"\n'
         )
-
-        local BASH_RPC_STDIN_IS_TTY=$([ ! -t 0 ] || echo y)
         {
                 printf '%s' "$stage2_source"
                 cat
         } |
-                ${BASH_RPC_STDIN_IS_TTY:+ with_ssh_option '-tt'} \
-                remote_run_function_simple \
+                bash_rpc_run_function_simple \
                         bash_rpc_eval_stdin \
                                 "${#stage2_source}" \
                                 "$@"
 }
 
+remote_run_function_tty()
+{
+        main=$1
+        funcs=$(recursive_dependencies "$main")
+        stage2_source=$(
+                declare -f $funcs
+                printf 'TERM=%s\n' "${TERM@Q}"
+                printf '"$@"\n'
+        )
+        (
+                TERM="$stage2_source"
+                export TERM
+                read -r bashcode <<'END'
+:; rpc=$TERM; TERM=screen; source <(printf '%s' "$rpc")
+END
+                exec ssh localhost -t -- bash -c "${bashcode@Q}" bash "$@"
+        )
+}
+
+remote_run_function()
+{
+        if [ -t 0 ]
+        then
+                remote_run_function_tty "$@"
+        else
+                remote_run_function_notty "$@"
+        fi
+}