arti/zsh-autoenv
1
0
Fork 0
mirror of https://github.com/Tarrasch/zsh-autoenv.git synced 2024-11-29 18:00:59 +02:00
Code Releases Activity

Only source varstash lib if it's being used

Browse Source 
I have noticed that `autostash` called an (accidentally)
defined/overwritten `stash` function.

While it's not possible to put this into a local scope, this will at
least make it less polluting by default (when autostashing is not used).

Additionally we could source it always (not just once), but then it
would only re-overwrite the function.

A better fix would be to prefix the functions explicitly, e.g.
`autoenv_autostash` etc.
This commit is contained in:
Daniel Hahler 2016-04-26 20:07:33 +02:00
parent f021750e89
commit 1dd8e8bd46
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autoenv.zsh
View File

@ -260,8 +260,12 @@ _autoenv_source() {
local autoenv_to_dir=$PWD local autoenv_to_dir=$PWD
# Source varstash library once. # Source varstash library once.
# XXX: pollutes environment with e.g. `stash`, and `autostash` will cause
# an overwritten `stash` function to be called!
if [[ -z "$functions[(I)autostash]" ]]; then if [[ -z "$functions[(I)autostash]" ]]; then
source ${${funcsourcetrace[1]%:*}:h}/lib/varstash if \grep -qE '\b(autostash|autounstash|stash)\b' $autoenv_env_file; then
source ${${funcsourcetrace[1]%:*}:h}/lib/varstash
fi
# NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to # NOTE: Varstash uses $PWD as default for varstash_dir, we might set it to
# ${autoenv_env_file:h}. # ${autoenv_env_file:h}.
fi fi
@ -331,7 +335,9 @@ _autoenv_chpwd_handler() {
fi fi
# Unstash any autostashed stuff. # Unstash any autostashed stuff.
varstash_dir=$prev_dir autounstash if [[ -n "$functions[(I)autostash]" ]]; then
varstash_dir=$prev_dir autounstash
fi
_autoenv_stack_entered_remove $prev_file _autoenv_stack_entered_remove $prev_file
fi fi