fix(bootstrap): recover runtime path when JAROWORKDIR is invalid

Author: jaromil

.github/workflows/pr-tests.yml

@@ -31,6 +31,7 @@ jobs:
           chmod +x extras/test/test-filtering.sh
           chmod +x extras/test/test-sieve-import.sh
           chmod +x extras/test/test-helpers.sh
+          chmod +x extras/test/test-bootstrap-paths.sh
 
       - name: Build
         run: make
@@ -55,3 +56,6 @@ jobs:
 
       - name: Helper binary tests
         run: extras/test/test-helpers.sh
+
+      - name: Bootstrap path tests
+        run: extras/test/test-bootstrap-paths.sh

extras/test/test-bootstrap-paths.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env zsh
+
+set -euo pipefail
+
+script_dir="${0:A:h}"
+source "${script_dir}/lib/test_helpers.zsh"
+test_setup "${0}"
+
+cleanup() {
+  test_cleanup
+}
+trap cleanup EXIT INT TERM
+
+bad_root="${tmp_root}/missing-workdir"
+mkdir -p "${bad_root}"
+
+output="$(
+  JAROMAILDIR="${mail_root}" \
+  JAROWORKDIR="${bad_root}" \
+  "${repo_root}/src/jaro" source addr 2>&1
+)"
+
+assert_contains "${output}" "System in ${repo_root}/src" "bootstrap recovers workdir"
+assert_contains "${output}" "Mail in ${mail_root}" "bootstrap keeps maildir"

src/zlibs/bootstrap

@@ -3,6 +3,8 @@
 # Resolve runtime paths and load the core framework + libraries.
 # use GNU/Linux default in local
 WORKDIR="/usr/local/share/jaromail"
+bootstrap_file="${(%):-%x}"
+bootstrap_root="${bootstrap_file:A:h:h}"
 
     # check if we are testing from source
     if [[ -r ../src/jaro ]]; then
@@ -18,6 +20,19 @@ WORKDIR="/usr/local/share/jaromail"
     # env override
     WORKDIR=${JAROWORKDIR:-$WORKDIR}
 
+    # If WORKDIR is blank or does not contain zlibs, derive it from this file.
+    if [[ -z "$WORKDIR" || ! -d "$WORKDIR/zlibs" ]]; then
+        if [[ -d "$bootstrap_root/zlibs" ]]; then
+            WORKDIR="$bootstrap_root"
+        fi
+    fi
+
+    # Abort early if no valid runtime path can be found.
+    if [[ ! -d "$WORKDIR/zlibs" ]]; then
+        print -u2 "Cannot find Jaro Mail runtime in WORKDIR: ${WORKDIR}"
+        exit 1
+    fi
+
     # load our zuper extension
     # different load paths from inside source or installed
     if [[ -r "$WORKDIR/zuper/zuper" ]]; then