Use shell variables instead of env variables

This commit is contained in:
Ajeet D'Souza 2021-08-31 16:28:49 +05:30
parent 11535a3fb6
commit 3ca89d0e6e

View File

@ -20,12 +20,11 @@ fn __zoxide_cd [path]{
# Hook configuration for zoxide.
#
if (not (and (builtin:has-env __zoxide_hooked) (builtin:eq (builtin:get-env __zoxide_hooked) 1))) {
builtin:set-env __zoxide_hooked 1
# Initialize hook to track previous directory.
builtin:set-env __zoxide_oldpwd $pwd
before-chdir = [$@before-chdir [_]{ builtin:set-env __zoxide_oldpwd $pwd }]
__zoxide_oldpwd = $pwd
before-chdir = [$@before-chdir [_]{ edit:add-var __zoxide_oldpwd $pwd }]
{#- __zoxide_hooked requires https://github.com/elves/elvish/issues/1395 #}
# Initialize hook to add directories to zoxide.
{%- match hook %}
@ -36,7 +35,6 @@ if (not (and (builtin:has-env __zoxide_hooked) (builtin:eq (builtin:get-env __zo
{%- when InitHook::Pwd %}
after-chdir = [$@after-chdir [_]{ zoxide add -- $pwd }]
{%- endmatch %}
}
{{ section }}
# When using zoxide with --no-aliases, alias these internal functions as
@ -48,7 +46,7 @@ fn __zoxide_z [@rest]{
if (builtin:eq [] $rest) {
__zoxide_cd ~
} elif (builtin:eq [-] $rest) {
__zoxide_cd (builtin:get-env __zoxide_oldpwd)
__zoxide_cd $__zoxide_oldpwd
} elif (and ('builtin:==' (builtin:count $rest) 1) (path:is-dir &follow-symlink=$true $rest[0])) {
__zoxide_cd $rest[0]
} else {
@ -97,4 +95,4 @@ edit:add-var zi~ $__zoxide_zi~
#
# eval (zoxide init elvish | slurp)
#
# Note that zoxide only supports elvish v0.16.0+.
# Note that zoxide only supports elvish v0.16.0 and above.