split up rpc.bash into source-able library

2 files changed, 69 insertions, 61 deletions

diff --git a/rpc.bash b/src/rpc.bash
index 5cb2f38..91292cd 100644
--- a/rpc.bash
+++ b/src/rpc.bash
@@ -1,63 +1,31 @@
-#!/usr/bin/bash -e
-set -e
-set -o pipefail
 
-max_script_size=$((1024 * 64))
-
-our_main()
-{
-        REMOTE_DEST=localhost
-        main2 "$@"
-        main1 "$@"
-}
-
-main1()
-{
-        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()
+intersection()
 {
-        intersection <(extract_words < "$BASH_SOURCE") \
-                     <(difference <(all_commands) \
-                                  <(remote_run_function all_commands))
+        comm -12 "$@"
 }
 
-all_commands()
+difference()
 {
-        : main2
-        compgen -A command | sort -u
+        comm -23 "$@"
 }
 
-gudge()
+extract_words()
 {
-        echo "Hello, ${REPLY@Q}."
-        echo "Don't argue with me about ${*@Q}."
+        grep -o -E '\b\w+\b' | sort -u
 }
 
-fudge()
+read_len()
 {
-        read -p 'Name? ' && gudge "$@"
-        exit
+        [ "$1" -gt 0 ]
+        REPLY=
+        read -r -N"$1"
+        [ "$REPLY" ]
 }
 
-
-
-
 read_remote_command()
 {
-        len=$1
+        read_len "$1"
         shift
-        [ "$len" -gt 0 ]
-        REPLY=
-        read -r -N"$len"
-        [ "$REPLY" ]
         remote_command=(bash -c ${REPLY@Q} bash "${@@Q}")
 }
 
@@ -86,16 +54,6 @@ remote_run_shell_script_arg1()
         fi
 }
 
-intersection()
-{
-        comm -12 "$@"
-}
-
-extract_words()
-{
-        grep -o -E '\b\w+\b' | sort -u
-}
-
 immediate_dependencies1()
 {
         # Thanks Lri from stackoverflow.com/questions/4471364/
@@ -113,11 +71,6 @@ immediate_dependencies()
         done | sort -u
 }
 
-difference()
-{
-        comm -23 "$@"
-}
-
 recursive_dependencies()
 {
         resolved=()
@@ -137,7 +90,7 @@ remote_run_function()
         funcs=$(recursive_dependencies "$main")
 
         script=
-        read -N${max_script_size} -r script < <(
+        read -N2147483647 -r script < <(
                 declare -f $funcs
                 printf '%s "$@";\n' "$main"
         ) || [ "$script" ]
@@ -145,4 +98,3 @@ remote_run_function()
         remote_run_shell_script_arg1 "$script" "$@"
 }
 
-our_main "$@"
diff --git a/src/rpc.main.bash b/src/rpc.main.bash
new file mode 100644
index 0000000..b859509
--- /dev/null
+++ b/src/rpc.main.bash
@@ -0,0 +1,56 @@
+#!/usr/bin/bash -e
+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()
+{
+        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()
+{
+        intersection <(extract_words < "$BASH_SOURCE") \
+                     <(difference <(all_commands) \
+                                  <(remote_run_function all_commands))
+}
+
+all_commands()
+{
+        : main2
+        compgen -A command | sort -u
+}
+
+gudge()
+{
+        echo "Hello, ${REPLY@Q}."
+        topic=${*@Q}
+        echo "Don't argue with me about ${topic:-punctuation}."
+}
+
+fudge()
+{
+        read -p 'Name? ' && gudge "$@"
+        exit
+}
+
+our_main "$@"
+