YES

3 files changed, 53 insertions, 52 deletions

diff --git a/src/rpc.bash b/src/rpc.bash
index d13942b..853120f 100644
--- a/src/rpc.bash
+++ b/src/rpc.bash
@@ -73,18 +73,29 @@ __bashrpc__run_function_simple()
                 "$@"
 }
 
+__bashrpc__notty_stage1()
+{
+        [ "$1" ] &&
+        read -N"$1" -r && # Read script from stdin, munges REPLY
+        shift && # Prepare "$@" for script execution context.
+        eval "unset REPLY; $REPLY" # Unset munged REPLY in exec context
+}
+
 __bashrpc__remote_run_stage1_notty()
 {
+        stage1_source=$(
+                declare -f __bashrpc__notty_stage1 |
+                        sed -Ene 's/^ {4}//p'
+        )
         stage2_source=$1
         shift
         {
                 printf '%s' "$stage2_source"
                 cat
         } |
-                __bashrpc__run_function_simple \
-                        __bashrpc__eval_stdin \
-                                "${#stage2_source}" \
-                                "$@"
+                __bashrpc__remote_run_script \
+                        "$stage1_source" "${#stage2_source}" \
+                        "$@"
 }
 
 __bashrpc__read_stdin()
@@ -96,7 +107,7 @@ __bashrpc__read_stdin()
 __bashrpc__tty_stage1()
 {
         local SET_TERM="$1"
-        local prelude="shift;${BASH_RPC_TRACE_REMOTE:+ set -x;}"
+        local PRELUDE="shift;${BASH_RPC_TRACE_REMOTE:+ set -x;}"
         __bashrpc__read_stdin <<END
 # We saved stage2 in TERM.
 # Store it in parameter 1:
@@ -104,10 +115,7 @@ set -- "\$TERM" "\$@"
 # Restore original TERM:
 TERM=${SET_TERM@Q}
 # Run stage2:
-source <(
-        printf '%s\n' "$prelude"
-        printf '%s'   "\$1"
-)
+source <(printf '%s\n%s' ${PRELUDE@Q} "\$1")
 END
         printf '%s' "$REPLY"
 }
@@ -115,7 +123,7 @@ END
 __bashrpc__remote_run_stage1_tty()
 {
         stage2_source=$1
-        stage1_source=$(__bashrpc__tty_stage1 "$TERM")
+        stage1_source=$(__bashrpc__tty_stage1 "$TERM" | grep -v '^#')
         shift
         (
                 # printf 'DEBUG2:<%s>\n' "${BASH_RPC_SSH_OPTIONS[@]}" >&2
diff --git a/src/rpc.main.bash b/src/rpc.main.bash
index c34296e..21dc071 100644
--- a/src/rpc.main.bash
+++ b/src/rpc.main.bash
@@ -1,46 +1,10 @@
-#!/usr/bin/bash -e
+#!/bin/bash
 set -e
 set -o pipefail
-
 case "$0" in
         [^/]* ) PATH=$(realpath -e "$(dirname "$BASH_SOURCE")"):$PATH ;;
 esac
-
-. rpc.bash
-
-our_main()
-{
-        REMOTE_DEST=localhost
-#       main2 "$@"
-        main1 "$@"
-}
-
-main1()
-{
-        # local -a BASH_RPC_SSH_OPTIONS=('-4' '-6' '-4')
-        with_ssh_options -4 -6 -4 -- \
-        remote_run_function fudge "$@"
-}
-
-main2()
-{
-        funcs=$(find_local_only_functions "$@" </dev/null | xargs)
-        [ ! "$funcs" ] || printf 'Local-only functions (main2): %s\n' "$funcs" >&2
-}
-
-find_local_only_functions()
-{
-        remote_commands=($(remote_run_function all_commands | sort -u))
-        intersection <(extract_words < "$BASH_SOURCE") \
-                     <(difference <(all_commands) \
-                                  <(printf '%s\n' "${remote_commands[@]}"))
-}
-
-all_commands()
-{
-        : main2
-        compgen -A command | sort -u
-}
+source rpc.bash
 
 gudge()
 {
@@ -48,12 +12,11 @@ gudge()
         topic=${*@Q}
         echo "Don't argue with me about ${topic:-punctuation}."
 }
-
 fudge()
 {
         read -p "[$(hostname)] Name? " && gudge "$@"
         exit
 }
-
-our_main "$@"
-
+with_ssh_options -4 -- \
+        remote_run_function \
+                fudge "$@"
diff --git a/src/rpc.main2.bash b/src/rpc.main2.bash
new file mode 100644
index 0000000..ad5e15b
--- /dev/null
+++ b/src/rpc.main2.bash
@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+set -o pipefail
+case "$0" in
+        [^/]* ) PATH=$(realpath -e "$(dirname "$BASH_SOURCE")"):$PATH ;;
+esac
+source rpc.bash
+
+main()
+{
+        funcs=$(find_local_only_functions "$@" </dev/null | xargs)
+        [ ! "$funcs" ] || printf 'Local-only functions (main2): %s\n' "$funcs" >&2
+}
+
+find_local_only_functions()
+{
+        remote_commands=($(remote_run_function all_commands | sort -u))
+        printf 'remote commands: %d\n' ${#remote_commands[@]} >&2
+        intersection <(extract_words < "$BASH_SOURCE") \
+                     <(difference <(all_commands) \
+                                  <(printf '%s\n' "${remote_commands[@]}"))
+}
+
+all_commands()
+{
+        : main
+        compgen -A command | sort -u
+}
+
+main "$@"