more WIP

1 files changed, 98 insertions, 23 deletions

diff --git a/rpc.bash b/rpc.bash
index a530216..934934f 100644
--- a/rpc.bash
+++ b/rpc.bash
@@ -2,42 +2,117 @@
 set -e
 set -o pipefail
 
-f()
+max_script_size=$((1024 * 64))
+
+main()
+{
+        test -t 0 && NO_TTY= || NO_TTY=y
+        REMOTE_DEST=localhost
+
+        intersection <(extract_words < "$BASH_SOURCE" | sort -u | tee all-extracted-words.txt ) \
+                     <(difference <(                    all_commands | sort -u | tee all-commands.txt ) \
+                                  <(remote_run_function all_commands | sort -u | tee all-remote-commands.txt ))
+}
+
+all_commands()
+{
+        : main
+        compgen -A command
+}
+
+gudge()
 {
-        read -p 'Name? ' &&
-        echo "Hello, $REPLY"
-        exit
+        echo "Hello, $REPLY"
 }
 
-script=$(declare -f f; echo f)
+fudge()
+{
+        echo "Don't argue with me about <$*>"
+        read -p 'Name? ' && gudge "$@"
+        exit
+}
 
 remote_run_shell_script_stdin()
 {
-        len=$1
-        [ "$len" -gt 0 ]
-        read -r -N"$len"
-        bash -exc "eval ${REPLY@Q}"
+        len=$1
+        [ "$len" -gt 0 ]
+        REPLY=
+        read -r -N"$len"
+        [ "$REPLY" ]
+
+        remote_command=(bash -c ${REPLY@Q} "$@")
+        if [ "$NO_TTY" ]
+        then
+                ssh    -- "${REMOTE_DEST}" "${remote_command[@]}"
+        else
+                ssh -t -- "${REMOTE_DEST}" "${remote_command[@]}" </dev/tty
+        fi
 }
 
 remote_run_shell_script_arg1()
 {
-        script=$1
-        shift
-        (echo -n "$script"; cat) | remote_run_shell_script_stdin "${#script}" "$@"
+        script=$1
+        shift
+        (echo -n "$script"; [ ! "$NO_TTY" ] || cat) | remote_run_shell_script_stdin "${#script}" "$@" | tr -d '\015'
+}
+
+intersection()
+{
+        comm -12 "$@"
+}
+
+extract_words()
+{
+        grep -o -E '\b\w+\b'
+}
+
+immediate_dependencies1()
+{
+        # Thanks Lri from stackoverflow.com/questions/4471364/
+        # how-do-i-list-the-functions-defined-in-my-shell/28278090
+        intersection \
+                <(compgen -A function | sort -u) \
+                <(declare -f "$1" | extract_words | sort -u)
+}
+
+immediate_dependencies()
+{
+        for f
+        do
+                immediate_dependencies1 "$f"
+        done | sort -u
+}
+
+difference()
+{
+        comm -23 "$@"
+}
+
+recursive_dependencies()
+{
+        resolved=()
+        while [ $# -gt 0 ]
+        do
+                resolved+=("$@")
+                set -- $(difference <(immediate_dependencies "$@" | sort -u) \
+                                    <(printf '%s\n' "${resolved[@]}" | sort -u))
+        done
+        printf '%s\n' "${resolved[@]}"
 }
 
-# Thanks Lri from stackoverflow.com/questions/4471364/
-# how-do-i-list-the-functions-defined-in-my-shell/28278090
 remote_run_function()
 {
-        main=$1
-        shift
-        funcs=$(comm \
-                <(declare -f "$main" | grep -o -E '\b\w+\b' | sort -u) \
-                <(compgen -A function | sort -u)
-        )
-        script=$(declare -f $funcs; printf '%s "$@";\n' "$main")
-        remote_run_shell_script_arg1 "$script" "$@"
+        main=$1
+        shift
+        funcs=$(recursive_dependencies "$main")
+
+        script=
+        read -N${max_script_size} -r script < <(
+                declare -f $funcs
+                printf '%s "$@";\n' "$main"
+        ) || [ "$script" ]
+
+        remote_run_shell_script_arg1 "$script" "$@"
 }
 
-remote_run_function f
+main "$@"