autoenv refactor
This commit is contained in:
parent
a4d8e204f6
commit
4ea4da352f
@ -31,24 +31,26 @@ _autoenv_envfile_authorize() {
|
|||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
_autoenv() {
|
_autoenv_source_if_authorized() {
|
||||||
if ! _autoenv_envfile_authorize "${PWD}/${AUTOENV_FILE_ENTER}"; then
|
local file_to_source="${1}"
|
||||||
return
|
|
||||||
|
if [ ! -s "${file_to_source}" ]; then
|
||||||
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "${PWD}/${AUTOENV_FILE_ENTER}" ]; then
|
if ! _autoenv_envfile_authorize "${file_to_source}"; then
|
||||||
source "${PWD}/${AUTOENV_FILE_ENTER}"
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
source "${file_to_source}"
|
||||||
|
}
|
||||||
|
|
||||||
|
_autoenv() {
|
||||||
|
_autoenv_source_if_authorized "${PWD}/${AUTOENV_FILE_ENTER}"
|
||||||
}
|
}
|
||||||
|
|
||||||
_autoenv_leave() {
|
_autoenv_leave() {
|
||||||
if ! _autoenv_envfile_authorize "${OLDPWD}/${AUTOENV_FILE_LEAVE}"; then
|
_autoenv_source_if_authorized "${OLDPWD}/${AUTOENV_FILE_LEAVE}"
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "${OLDPWD}/${AUTOENV_FILE_LEAVE}" ]; then
|
|
||||||
source "${OLDPWD}/${AUTOENV_FILE_LEAVE}"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ "${AUTOENV_DISABLED}" != 1 ]]; then
|
if [[ "${AUTOENV_DISABLED}" != 1 ]]; then
|
||||||
@ -59,12 +61,7 @@ if [[ "${AUTOENV_DISABLED}" != 1 ]]; then
|
|||||||
add-zsh-hook chpwd _autoenv_leave
|
add-zsh-hook chpwd _autoenv_leave
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "${PWD}/${AUTOENV_FILE_ENTER}" ]; then
|
_autoenv_source_if_authorized "${PWD}/${AUTOENV_FILE_ENTER}"
|
||||||
if _autoenv_envfile_authorize "${PWD}/${AUTOENV_FILE_ENTER}"; then
|
|
||||||
source "${PWD}/${AUTOENV_FILE_ENTER}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user