Use ZSH_CONFIG for full install and prevent env resolver loops (#10)

Author: bicabone

README.md

@@ -38,7 +38,7 @@ source ~/.zshrc
 
 | Flag | What it does |
 |---|---|
-| `--full` | Also installs helper functions (`tq`, `td`, `tl`) by symlinking `temporal.zsh` into `~/.config/zsh/` |
+| `--full` | Also installs helper functions (`tq`, `td`, `tl`) by symlinking `temporal.zsh` into `$ZSH_CONFIG` (or `${ZSH_CUSTOM:-${ZSH:-$HOME/.oh-my-zsh}/custom}` when unset) |
 | `[path]` | Install to a custom plugins directory instead of `$ZSH_CUSTOM/plugins` |
 
 ```bash

install.sh

@@ -100,7 +100,7 @@ else
 fi
 
 if [[ "$full_mode" == "1" ]]; then
-  zshc_dir="${ZSHC:-$HOME/.config/zsh}"
+  zshc_dir="${ZSH_CONFIG:-${ZSH_CUSTOM:-${ZSH:-$HOME/.oh-my-zsh}/custom}}"
   helper_source="$target_dir/temporalctx.full.zsh"
   helper_target="$zshc_dir/temporal.zsh"
   mkdir -p "$zshc_dir"

temporalctx.plugin.zsh

@@ -136,12 +136,16 @@ _temporalctx_resolve_value() {
   printf '%s\n' "$value" | awk '
     {
       s = $0
-      while (match(s, /\$\{[A-Za-z_][A-Za-z0-9_]*\}/)) {
-        var = substr(s, RSTART + 2, RLENGTH - 3)
-        val = ENVIRON[var]
-        s = substr(s, 1, RSTART - 1) val substr(s, RSTART + RLENGTH)
+      out = ""
+      pos = 1
+      while (match(substr(s, pos), /\$\{[A-Za-z_][A-Za-z0-9_]*\}/)) {
+        mstart = pos + RSTART - 1
+        out = out substr(s, pos, mstart - pos)
+        var = substr(s, mstart + 2, RLENGTH - 3)
+        out = out ENVIRON[var]
+        pos = mstart + RLENGTH
       }
-      print s
+      print out substr(s, pos)
     }
   '
 }

tests/install_test.sh

@@ -44,15 +44,15 @@ PATH="$tmp_root/bin:$PATH" HOME="$home2" "$REPO_ROOT/install.sh" "$custom_target
 [[ -L "$custom_target/temporalctx" || -d "$custom_target/temporalctx/.git" ]] || fail "custom target should install to <dir>/temporalctx"
 log "case passed: custom target"
 
-# Test: --full installs opinionated helpers into ZSHC/temporal.zsh.
-log "case: --full installs opinionated helpers in ZSHC"
+# Test: --full installs opinionated helpers into ZSH_CONFIG/temporal.zsh.
+log "case: --full installs opinionated helpers in ZSH_CONFIG"
 home3="$tmp_root/home3"
-zshc3="$tmp_root/zshc3"
+zsh_config3="$tmp_root/zsh_config3"
 plugins3="$tmp_root/plugins3"
-mkdir -p "$home3" "$zshc3" "$plugins3"
-PATH="$tmp_root/bin:$PATH" HOME="$home3" ZSHC="$zshc3" "$REPO_ROOT/install.sh" --full "$plugins3" >"$tmp_root/install3.out" 2>"$tmp_root/install3.err"
-[[ -L "$zshc3/temporal.zsh" ]] || fail "--full should install temporal.zsh as a symlink in ZSHC"
-link_target="$(readlink "$zshc3/temporal.zsh")"
+mkdir -p "$home3" "$zsh_config3" "$plugins3"
+PATH="$tmp_root/bin:$PATH" HOME="$home3" ZSH_CONFIG="$zsh_config3" "$REPO_ROOT/install.sh" --full "$plugins3" >"$tmp_root/install3.out" 2>"$tmp_root/install3.err"
+[[ -L "$zsh_config3/temporal.zsh" ]] || fail "--full should install temporal.zsh as a symlink in ZSH_CONFIG"
+link_target="$(readlink "$zsh_config3/temporal.zsh")"
 assert_contains "$link_target" "temporalctx.full.zsh" "--full helper symlink should point to plugin helper file"
 log "case passed: --full helpers"
 

tests/temporalctx_plugin_test.sh

@@ -197,4 +197,13 @@ assert_contains "$out" "wrapped=ARGS: --address us-west-2.aws.api.temporal.io:72
 assert_contains "$out" "raw=ARGS: workflow list --limit 5" "opt-out env var should bypass wrapping"
 log "case passed: temporal wrapper"
 
+# Test: env placeholders do not loop on self-referential exports.
+log "case: self-referential env values do not hang"
+out="$(PATH="$tmp_root/bin:$PATH" TEMPORAL_CONFIG="$cfg" TEMPORAL_CLOUD_PROD_API_KEY='${TEMPORAL_CLOUD_PROD_API_KEY}' zsh -c '
+  source "'$REPO_ROOT'/temporalctx.plugin.zsh"
+  echo "flags=$(_temporal_flags)"
+')"
+assert_contains "$out" "flags=--address us-west-2.aws.api.temporal.io:7233 --namespace example-prod.a1b2c --tls --api-key" "resolver should return without looping on self-referential env values"
+log "case passed: self-referential env values"
+
 echo "PASS: temporalctx.plugin.zsh"

tests/uninstall_test.sh

@@ -50,12 +50,12 @@ log "case passed: purge config"
 log "case: --full removes helper link"
 home3="$tmp_root/home3"
 custom3="$tmp_root/custom3"
-zshc3="$tmp_root/zshc3"
-mkdir -p "$home3" "$custom3" "$zshc3"
-PATH="$tmp_root/bin:$PATH" HOME="$home3" ZSH_CUSTOM="$custom3" ZSHC="$zshc3" "$REPO_ROOT/install.sh" --full >"$tmp_root/i3.out" 2>"$tmp_root/i3.err"
-[[ -L "$zshc3/temporal.zsh" ]] || fail "--full should create helper symlink"
-HOME="$home3" ZSH_CUSTOM="$custom3" ZSHC="$zshc3" "$REPO_ROOT/uninstall.sh" --full >"$tmp_root/u3.out" 2>"$tmp_root/u3.err"
-[[ ! -e "$zshc3/temporal.zsh" ]] || fail "--full uninstall should remove helper symlink"
+zsh_config3="$tmp_root/zsh_config3"
+mkdir -p "$home3" "$custom3" "$zsh_config3"
+PATH="$tmp_root/bin:$PATH" HOME="$home3" ZSH_CUSTOM="$custom3" ZSH_CONFIG="$zsh_config3" "$REPO_ROOT/install.sh" --full >"$tmp_root/i3.out" 2>"$tmp_root/i3.err"
+[[ -L "$zsh_config3/temporal.zsh" ]] || fail "--full should create helper symlink"
+HOME="$home3" ZSH_CUSTOM="$custom3" ZSH_CONFIG="$zsh_config3" "$REPO_ROOT/uninstall.sh" --full >"$tmp_root/u3.out" 2>"$tmp_root/u3.err"
+[[ ! -e "$zsh_config3/temporal.zsh" ]] || fail "--full uninstall should remove helper symlink"
 log "case passed: full helper removal"
 
 echo "PASS: uninstall.sh"

uninstall.sh

@@ -65,7 +65,7 @@ else
   echo "Plugin path not found: $target_dir"
 fi
 
-zshc_dir="${ZSHC:-$HOME/.config/zsh}"
+zshc_dir="${ZSH_CONFIG:-${ZSH_CUSTOM:-${ZSH:-$HOME/.oh-my-zsh}/custom}}"
 helper_target="$zshc_dir/temporal.zsh"
 if [[ -L "$helper_target" ]]; then
   link_target="$(readlink "$helper_target" || true)"