Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 21 additions & 19 deletions internal/shell/bash.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,29 @@ import (

// Based on https://github.com/direnv/direnv/blob/master/internal/cmd/shell_bash.go
const bashHook = `
{{.EnvContent}}

export __VFOX_PID=$$;
export __VFOX_SHELL='bash';

_vfox_hook() {
local previous_exit_status=$?;
trap -- '' SIGINT;
eval "$("{{.SelfPath}}" env -s bash)";
trap - SIGINT;
return $previous_exit_status;
};
if ! [[ "${PROMPT_COMMAND[*]:-}" =~ _vfox_hook ]]; then
if [[ "$(declare -p PROMPT_COMMAND 2>&1)" == "declare -a"* ]]; then
PROMPT_COMMAND=(_vfox_hook "${PROMPT_COMMAND[@]}")
else
PROMPT_COMMAND="_vfox_hook${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
if [[ -z "$__VFOX_PID" || "$__VFOX_PID" != "$$" || "$__VFOX_SHELL" != "bash" ]]; then
{{.EnvContent}}

export __VFOX_PID=$$;
export __VFOX_SHELL='bash';

_vfox_hook() {
local previous_exit_status=$?;
trap -- '' SIGINT;
eval "$("{{.SelfPath}}" env -s bash)";
trap - SIGINT;
return $previous_exit_status;
};
if ! [[ "${PROMPT_COMMAND[*]:-}" =~ _vfox_hook ]]; then
if [[ "$(declare -p PROMPT_COMMAND 2>&1)" == "declare -a"* ]]; then
PROMPT_COMMAND=(_vfox_hook "${PROMPT_COMMAND[@]}")
else
PROMPT_COMMAND="_vfox_hook${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
fi
fi
fi

trap 'vfox env --cleanup' EXIT
trap 'vfox env --cleanup' EXIT
fi
`

type bash struct{}
Expand Down
2 changes: 1 addition & 1 deletion internal/shell/zsh.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type zsh struct{}
var Zsh = zsh{}

const zshHook = `
if [[ -z "$__VFOX_PID" || -z "$__VFOX_SHELL" ]]; then
if [[ -z "$__VFOX_PID" || "$__VFOX_PID" != "$$" || "$__VFOX_SHELL" != "zsh" ]]; then
{{.EnvContent}}

export __VFOX_PID=$$;
Expand Down