Skip to content

fix: pass caller's PATH to overlay subprocesses #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
i-kozlov wants to merge 1 commit into from
Closed

fix: pass caller's PATH to overlay subprocesses #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .claude-plugin/skills/revdiff/scripts/launch-revdiff.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ if [ -n "${REVDIFF_CONFIG:-}" ] && [ -f "$REVDIFF_CONFIG" ]; then
CONFIG_FLAG="--config=$REVDIFF_CONFIG"
fi
REVDIFF_CMD="$REVDIFF_BIN $CONFIG_FLAG --output=$OUTPUT_FILE $*"
# capture caller's PATH to pass into overlay subprocesses, which otherwise
# start with a minimal PATH missing user-installed tools (e.g. git-lfs)
CALLER_PATH="$PATH"
CWD="$(pwd)"

# build descriptive title: "rd: dirname [ref]"
Expand All @@ -45,7 +48,7 @@ POPUP_H="${REVDIFF_POPUP_HEIGHT:-90%}"

# tmux: display-popup -E blocks until command exits
if [ -n "${TMUX:-}" ] && command -v tmux >/dev/null 2>&1; then
tmux display-popup -E -w "$POPUP_W" -h "$POPUP_H" -T " $OVERLAY_TITLE " -d "$CWD" -- sh -c "$REVDIFF_CMD"
tmux display-popup -E -w "$POPUP_W" -h "$POPUP_H" -T " $OVERLAY_TITLE " -d "$CWD" -e "PATH=$CALLER_PATH" -- sh -c "$REVDIFF_CMD"
cat "$OUTPUT_FILE"
exit 0
fi
Expand All @@ -56,7 +59,7 @@ if [ -n "$KITTY_SOCK" ] && command -v kitty >/dev/null 2>&1; then
SENTINEL=$(mktemp /tmp/revdiff-done-XXXXXX)
rm -f "$SENTINEL"

KITTY_ARGS=(kitty @ --to "$KITTY_SOCK" launch --type=overlay --title="$OVERLAY_TITLE" --cwd="$CWD")
KITTY_ARGS=(kitty @ --to "$KITTY_SOCK" launch --type=overlay --title="$OVERLAY_TITLE" --cwd="$CWD" --env "PATH=$CALLER_PATH")
if [ -n "${KITTY_WINDOW_ID:-}" ]; then
KITTY_ARGS+=(--match "id:${KITTY_WINDOW_ID}")
fi
Expand All @@ -80,7 +83,8 @@ if [ -n "${WEZTERM_PANE:-}" ] && command -v wezterm >/dev/null 2>&1; then
WEZTERM_PCT="${REVDIFF_POPUP_HEIGHT:-90%}"
WEZTERM_PCT="${WEZTERM_PCT%%%}"
wezterm cli split-pane --bottom --percent "$WEZTERM_PCT" \
--pane-id "$WEZTERM_PANE" --cwd "$CWD" -- sh -c "$REVDIFF_CMD; touch '$SENTINEL'" >/dev/null 2>&1
--pane-id "$WEZTERM_PANE" --cwd "$CWD" -- \
env "PATH=$CALLER_PATH" sh -c "$REVDIFF_CMD; touch '$SENTINEL'" >/dev/null 2>&1

while [ ! -f "$SENTINEL" ]; do
sleep 0.3
Expand Down
Loading