bashrpc cleanups

3 files changed, 109 insertions, 74 deletions

diff --git a/src/dependencies.bash b/src/dependencies.bash
new file mode 100644
index 0000000..b6eee95
--- /dev/null
+++ b/src/dependencies.bash
@@ -0,0 +1,43 @@
+#!/bin/false
+
+intersection()
+{
+        comm -12 "$@"
+}
+
+difference()
+{
+        comm -23 "$@"
+}
+
+extract_words()
+{
+        grep -o -E '\b\w+\b' | sort -u
+}
+
+immediate_dependencies1()
+{
+        intersection \
+                <(compgen -A function | sort -u) \
+                <(declare -f "$1" | extract_words)
+}
+
+immediate_dependencies()
+{
+        (for f
+        do
+                immediate_dependencies1 "$f"
+        done) | sort -u
+}
+
+recursive_dependencies()
+{
+        local seen=()
+        while [ $# -gt 0 ]
+        do
+                seen+=("$@")
+                set -- $(difference <(immediate_dependencies "$@") \
+                                    <(printf '%s\n' "${seen[@]}" | sort -u))
+        done
+        printf '%s\n' "${seen[@]}"
+}
diff --git a/src/rpc.bash b/src/rpc.bash
index e7216a5..d13942b 100644
--- a/src/rpc.bash
+++ b/src/rpc.bash
@@ -1,52 +1,6 @@
+#!/bin/false
 
-intersection()
-{
-        comm -12 "$@"
-}
-
-difference()
-{
-        comm -23 "$@"
-}
-
-extract_words()
-{
-        grep -o -E '\b\w+\b' | sort -u
-}
-
-immediate_dependencies1()
-{
-        intersection \
-                <(compgen -A function | sort -u) \
-                <(declare -f "$1" | extract_words)
-}
-
-immediate_dependencies()
-{
-        for f
-        do
-                immediate_dependencies1 "$f"
-        done | sort -u
-}
-
-recursive_dependencies()
-{
-        seen=()
-        while [ $# -gt 0 ]
-        do
-                seen+=("$@")
-                set -- $(difference <(immediate_dependencies "$@") \
-                                    <(printf '%s\n' "${seen[@]}" | sort -u))
-        done
-        printf '%s\n' "${seen[@]}"
-}
-
-
-
-
-
-
-
+source dependencies.bash
 
 # Input: $BASH_RPC_REMOTE_DEST - hostname passed to ssh (uses ssh host aliases)
 # Input: $BASH_RPC_SSH_OPTIONS - option arguments passed to ssh (they precede '--')
@@ -55,46 +9,71 @@ recursive_dependencies()
 # Input: $2, $3, ... - command line arguments passed to the remote bash as $1, $2, ...
 # Input: stdin, stdout, stderr: passed to the remote bash over ssh
 # Input: "$SHELL" - remote shell to launch (better be bash)
-bash_rpc_remote_run_script()
+__bashrpc__remote_run_script()
 {
         local script="$1"
         shift
+        BASH_RPC_SHELL_OPTIONS=(--norc --noprofile)
+        set -x
+        # printf 'DEBUG:<%s>\n' "${BASH_RPC_SSH_OPTIONS[@]}" >&2
         exec ssh \
                 "${BASH_RPC_SSH_OPTIONS[@]}" -- \
                 "${BASH_RPC_REMOTE_DEST:-localhost}" \
-                "$SHELL" -c "${script@Q}" "$0" "${@@Q}"
+                "$SHELL" "${BASH_RPC_SHELL_OPTIONS[@]}" \
+                -c "${script@Q}" \
+                "$0" "${@@Q}"
 }
 
-bash_rpc_with_ssh_option()
+with_ssh_options() { __bashrpc__with_ssh_options "$@"; }
+__bashrpc__with_ssh_options()
 {
-        local BASH_RPC_SSH_OPTIONS
+        local -a BASH_RPC_SSH_OPTIONS
+        while [ "$1" != '--' ]
+        do
+                if [ $# -gt 0 ]
+                then
+                        BASH_RPC_SSH_OPTIONS+=("$1")
+                        shift
+                        continue
+                fi
+                >&2 printf '%s: Error: %s\n' "$0" \
+'with_ssh_options(): expected argument "--" not found'
+                exit 1
+        done
+        shift
+        "$@"
+}
+
+with_ssh_option() { __bashrpc__with_ssh_option "$@"; }
+__bashrpc__with_ssh_option()
+{
+        local -a BASH_RPC_SSH_OPTIONS=("${BASH_RPC_SSH_OPTIONS[@]}")
         BASH_RPC_SSH_OPTIONS+=("$1")
         shift
         "$@"
 }
 
 # Preserves the rest of stdin for the command.
-bash_rpc_eval_stdin()
+__bashrpc__eval_stdin()
 {
-        [ "$1" -gt 0 ] || return
-        read -N"$1" -r || return
+        [ "$1" ] && read -N"$1" -r || return
 
         # Prepare "$@" for script execution context.
         shift
 
         # Even unset REPLY to leave pristine environment.
-        eval "unset REPLY; $(cat <<< "$REPLY")"
+        eval "unset REPLY; $REPLY"
 }
 
-bash_rpc_run_function_simple()
+__bashrpc__run_function_simple()
 {
         script_source=$(declare -f "$1" && printf '"$@";\n')
-        bash_rpc_remote_run_script  \
+        __bashrpc__remote_run_script  \
                 "$script_source" \
                 "$@"
 }
 
-remote_run_stage1_notty()
+__bashrpc__remote_run_stage1_notty()
 {
         stage2_source=$1
         shift
@@ -102,38 +81,47 @@ remote_run_stage1_notty()
                 printf '%s' "$stage2_source"
                 cat
         } |
-                bash_rpc_run_function_simple \
-                        bash_rpc_eval_stdin \
+                __bashrpc__run_function_simple \
+                        __bashrpc__eval_stdin \
                                 "${#stage2_source}" \
                                 "$@"
 }
 
-read_stdin()
+__bashrpc__read_stdin()
 {
         REPLY=
         read -r -N2147483647 || [ "$REPLY" ]
 }
 
-tty_stage1()
+__bashrpc__tty_stage1()
 {
         local SET_TERM="$1"
-        read_stdin <<END
-                set -- "\$TERM" "\$@"
-                TERM=${SET_TERM@Q}
-                source <(echo shift; printf '%s' "\$1")
+        local prelude="shift;${BASH_RPC_TRACE_REMOTE:+ set -x;}"
+        __bashrpc__read_stdin <<END
+# We saved stage2 in TERM.
+# Store it in parameter 1:
+set -- "\$TERM" "\$@"
+# Restore original TERM:
+TERM=${SET_TERM@Q}
+# Run stage2:
+source <(
+        printf '%s\n' "$prelude"
+        printf '%s'   "\$1"
+)
 END
         printf '%s' "$REPLY"
 }
 
-remote_run_stage1_tty()
+__bashrpc__remote_run_stage1_tty()
 {
         stage2_source=$1
-        stage1_source=$(tty_stage1 "$TERM")
+        stage1_source=$(__bashrpc__tty_stage1 "$TERM")
         shift
         (
+                # printf 'DEBUG2:<%s>\n' "${BASH_RPC_SSH_OPTIONS[@]}" >&2
                 TERM="$stage2_source" \
-                        bash_rpc_with_ssh_option -t \
-                        bash_rpc_remote_run_script \
+                        __bashrpc__with_ssh_option -t \
+                        __bashrpc__remote_run_script \
                         "$stage1_source" "$@"
         )
 }
@@ -141,6 +129,7 @@ remote_run_stage1_tty()
 remote_run_function()
 {
         main=$1
+        # funcs=$(compgen -A function)
         funcs=$(recursive_dependencies "$main")
         stage2_source=$(
                 declare -f $funcs
@@ -148,8 +137,9 @@ remote_run_function()
         )
         if [ -t 0 ]
         then
-                remote_run_stage1_tty "$stage2_source" "$@"
+                __bashrpc__remote_run_stage1_tty "$stage2_source" "$@"
         else
-                remote_run_stage1_notty "$stage2_source" "$@"
+                __bashrpc__remote_run_stage1_notty "$stage2_source" "$@"
         fi
 }
+
diff --git a/src/rpc.main.bash b/src/rpc.main.bash
index 9fba425..c34296e 100644
--- a/src/rpc.main.bash
+++ b/src/rpc.main.bash
@@ -17,6 +17,8 @@ our_main()
 
 main1()
 {
+        # local -a BASH_RPC_SSH_OPTIONS=('-4' '-6' '-4')
+        with_ssh_options -4 -6 -4 -- \
         remote_run_function fudge "$@"
 }
 
@@ -49,7 +51,7 @@ gudge()
 
 fudge()
 {
-        read -p 'Name? ' && gudge "$@"
+        read -p "[$(hostname)] Name? " && gudge "$@"
         exit
 }