Skip to content

Commit ad87542

Browse files
committed
Fix issue with spaces in PATH vars
1 parent 1d212d1 commit ad87542

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.2.1
1+
develop

bin/antigen.zsh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ antigen-use () {
13601360
fi
13611361
}
13621362
antigen-version () {
1363-
local version="v2.2.1"
1363+
local version="develop"
13641364
local extensions revision=""
13651365
if [[ -d $_ANTIGEN_INSTALL_DIR/.git ]]; then
13661366
revision=" ($(git --git-dir=$_ANTIGEN_INSTALL_DIR/.git rev-parse --short '@'))"
@@ -1782,15 +1782,17 @@ typeset -g _ZCACHE_CAPTURE_PREFIX
17821782
cat > $ANTIGEN_CACHE <<EOC
17831783
#-- START ZCACHE GENERATED FILE
17841784
#-- GENERATED: $(date)
1785-
#-- ANTIGEN v2.2.1
1785+
#-- ANTIGEN develop
17861786
$(functions -- _antigen)
17871787
antigen () {
17881788
local MATCH MBEGIN MEND
17891789
[[ "\$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "\$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "$_ANTIGEN_INSTALL_DIR/antigen.zsh" && eval antigen \$@;
17901790
return 0;
17911791
}
1792+
$(export -p _PATH _fpath)
17921793
typeset -gaU fpath path
1793-
fpath+=(${_fpath[@]}) path+=(${_PATH[@]})
1794+
fpath+=(\$_fpath) path+=(\$_PATH)
1795+
unset _fpath _PATH
17941796
_antigen_compinit () {
17951797
autoload -Uz compinit; compinit -d "$ANTIGEN_COMPDUMP"; compdef _antigen antigen
17961798
add-zsh-hook -D precmd _antigen_compinit
@@ -1806,7 +1808,7 @@ ${(j::)_sources}
18061808
#--- BUNDLES END
18071809
typeset -gaU _ANTIGEN_BUNDLE_RECORD; _ANTIGEN_BUNDLE_RECORD=($(print ${(qq)_ANTIGEN_BUNDLE_RECORD}))
18081810
typeset -g _ANTIGEN_CACHE_LOADED; _ANTIGEN_CACHE_LOADED=true
1809-
typeset -g ANTIGEN_CACHE_VERSION; ANTIGEN_CACHE_VERSION='v2.2.1'
1811+
typeset -g ANTIGEN_CACHE_VERSION; ANTIGEN_CACHE_VERSION='develop'
18101812
18111813
#-- END ZCACHE GENERATED FILE
18121814
EOC

src/ext/cache.zsh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ antigen () {
4141
[[ "\$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "\$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "$_ANTIGEN_INSTALL_DIR/antigen.zsh" && eval antigen \$@;
4242
return 0;
4343
}
44+
$(export -p _PATH _fpath)
4445
typeset -gaU fpath path
45-
fpath+=(${_fpath[@]}) path+=(${_PATH[@]})
46+
fpath+=(\$_fpath) path+=(\$_PATH)
47+
unset _fpath _PATH
4648
_antigen_compinit () {
4749
autoload -Uz compinit; compinit -d "$ANTIGEN_COMPDUMP"; compdef _antigen antigen
4850
add-zsh-hook -D precmd _antigen_compinit

0 commit comments

Comments
 (0)