Consolidate build into one root Makefile; split run.sh into run-engine.sh/run-interpreter.sh

2026-07-05 16:35:18 +02:00
parent bd739ccfdf
commit 28558b4343
12 changed files with 300 additions and 199 deletions
@@ -1,11 +1,12 @@
 #!/bin/sh
 # Runs deck-engine for "today": the tarot seed and the transit moment come
 # from the OS clock, birth data comes from user.properties next to this
-# script. Usage: ./run.sh [text|html] [lang]
+# script. Usage: ./run-engine.sh [text|html|json] [lang]
 #
 # [lang] overrides user.properties' lang= for this run only (e.g.
-# ./run.sh html de); omit it to use lang= from user.properties, which
-# itself defaults to "en" if unset.
+# ./run-engine.sh html de); omit it to use lang= from user.properties,
+# which itself defaults to "en" if unset. See run-interpreter.sh for a
+# significance report instead of the full reading.

 set -eu

@@ -0,0 +1,84 @@
+#!/bin/sh
+# Runs deck-engine (--format json) piped straight into interpreter-cli for
+# "today": same OS-clock seed/transit-moment and user.properties birth
+# data as run-engine.sh, but reports how significant today's transits are
+# instead of printing the full reading. Usage: ./run-interpreter.sh
+#
+# Requires both dist/deck-engine (built by engine/'s Makefile) and
+# dist/interpreter-cli (built by interpreter/'s own Makefile) to already
+# exist next to this script.
+
+set -eu
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+ENGINE_BINARY="$SCRIPT_DIR/deck-engine"
+INTERPRETER_BINARY="$SCRIPT_DIR/interpreter-cli"
+PROPERTIES_FILE="$SCRIPT_DIR/user.properties"
+
+if [ ! -x "$ENGINE_BINARY" ]; then
+  echo "error: $ENGINE_BINARY not found or not executable (run 'make' in engine/ first)" >&2
+  exit 1
+fi
+
+if [ ! -x "$INTERPRETER_BINARY" ]; then
+  echo "error: $INTERPRETER_BINARY not found or not executable (run 'make' in interpreter/ first)" >&2
+  exit 1
+fi
+
+if [ ! -f "$PROPERTIES_FILE" ]; then
+  echo "error: $PROPERTIES_FILE not found" >&2
+  exit 1
+fi
+
+birth_date=""
+birth_time=""
+birth_utc_offset=""
+birth_lat=""
+birth_lon=""
+
+while IFS='=' read -r key value || [ -n "$key" ]; do
+  key="$(printf '%s' "$key" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
+  value="$(printf '%s' "$value" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
+  case "$key" in
+    '' | '#'*) continue ;;
+  esac
+  case "$key" in
+    birth_date) birth_date="$value" ;;
+    birth_time) birth_time="$value" ;;
+    birth_utc_offset) birth_utc_offset="$value" ;;
+    birth_lat) birth_lat="$value" ;;
+    birth_lon) birth_lon="$value" ;;
+  esac
+done <"$PROPERTIES_FILE"
+
+check_set() {
+  case "$2" in
+    '' | *YOUR_*)
+      echo "error: $PROPERTIES_FILE: '$1' is not set - edit the file and fill in your details." >&2
+      exit 1
+      ;;
+  esac
+}
+check_set birth_date "$birth_date"
+check_set birth_time "$birth_time"
+check_set birth_utc_offset "$birth_utc_offset"
+check_set birth_lat "$birth_lat"
+check_set birth_lon "$birth_lon"
+
+# OS-provided inputs: today's date is the tarot seed (stable all day, a
+# new spread each day), current UTC time drives today's transits. The
+# tarot seed doesn't matter for --format json (only "transits" is read
+# downstream) but it's kept identical to run-engine.sh's for consistency.
+seed="$(date +%Y-%m-%d)"
+transit_date="$(date -u +%Y-%m-%dT%H:%M)"
+
+"$ENGINE_BINARY" \
+  --seed "$seed" \
+  --birth-date "$birth_date" \
+  --birth-time "$birth_time" \
+  --birth-utc-offset "$birth_utc_offset" \
+  --birth-lat "$birth_lat" \
+  --birth-lon "$birth_lon" \
+  --date "$transit_date" \
+  --format json \
+  | exec "$INTERPRETER_BINARY"
@@ -1,6 +1,7 @@
 # deck-in-a-dash user properties
 #
-# Fill in your birth details below, then run ./run.sh (or ./run.sh html).
+# Fill in your birth details below, then run ./run-engine.sh (or
+# ./run-engine.sh html).
 # This file is only copied here once by the build - it will not be
 # overwritten by later builds, so it's safe to edit in place.
 #