cleaning and shit

1 files changed, 29 insertions, 26 deletions

diff --git a/src/rpc.bash b/src/rpc.bash
index ea72b3d..99ea7e2 100644
--- a/src/rpc.bash
+++ b/src/rpc.bash
@@ -95,14 +95,10 @@ bash_rpc_run_function_simple()
                 "$@"
 }
 
-remote_run_function_notty()
+remote_run_stage1_notty()
 {
-        main=$1
-        funcs=$(recursive_dependencies "$main")
-        stage2_source=$(
-                declare -f $funcs
-                printf '"$@"\n'
-        )
+        stage2_source=$1
+        shift
         {
                 printf '%s' "$stage2_source"
                 cat
@@ -119,35 +115,42 @@ read_stdin()
         read -r -N2147483647 || [ "$REPLY" ]
 }
 
-remote_run_function_tty()
+tty_stage1()
 {
-        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_stdin <<'END'
-                        rpc=$TERM
-                        TERM=screen
-                        source <(printf '%s' "$rpc")
+        local SET_TERM="$1"
+        read_stdin <<END
+                set -- "\$TERM" "\$@"
+                TERM=${SET_TERM@Q}
+                source <(echo shift; printf '%s' "\$1")
 END
-                bash_rpc_with_ssh_option -t \
+        printf '%s' "$REPLY"
+}
+
+remote_run_stage1_tty()
+{
+        stage2_source=$1
+        stage1_source=$(tty_stage1 "$TERM")
+        shift
+        (
+                TERM="$stage2_source" \
+                        bash_rpc_with_ssh_option -t \
                         bash_rpc_remote_run_script \
-                        "$REPLY" "$@"
+                        "$stage1_source" "$@"
         )
 }
 
 remote_run_function()
 {
+        main=$1
+        funcs=$(recursive_dependencies "$main")
+        stage2_source=$(
+                declare -f $funcs
+                printf '"$@"\n'
+        )
         if [ -t 0 ]
         then
-                remote_run_function_tty "$@"
+                remote_run_stage1_tty "$stage2_source" "$@"
         else
-                remote_run_function_notty "$@"
+                remote_run_stage1_notty "$stage2_source" "$@"
         fi
 }