Skip to content

Commit 1fe7819

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

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-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: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,27 @@ antigen () {
554554
fi
555555
done
556556
}
557+
zmodload zsh/datetime
558+
ANTIGEN_DEBUG_LOG=${ANTIGEN_DEBUG_LOG:-${ADOTDIR:-$HOME/.antigen}/debug.log}
559+
LOG () {
560+
local PREFIX="[LOG][${EPOCHREALTIME}]"
561+
echo "${PREFIX} ${funcfiletrace[1]}\n${PREFIX} $@" >> $ANTIGEN_DEBUG_LOG
562+
}
563+
564+
ERR () {
565+
local PREFIX="[ERR][${EPOCHREALTIME}]"
566+
echo "${PREFIX} ${funcfiletrace[1]}\n${PREFIX} $@" >> $ANTIGEN_DEBUG_LOG
567+
}
568+
569+
WARN () {
570+
local PREFIX="[WRN][${EPOCHREALTIME}]"
571+
echo "${PREFIX} ${funcfiletrace[1]}\n${PREFIX} $@" >> $ANTIGEN_DEBUG_LOG
572+
}
573+
574+
TRACE () {
575+
local PREFIX="[TRA][${EPOCHREALTIME}]"
576+
echo "${PREFIX} ${funcfiletrace[1]}\n${PREFIX} $@\n${PREFIX} ${(j:\n:)funcstack}" >> $ANTIGEN_DEBUG_LOG
577+
}
557578
# Usage:
558579
# -antigen-parse-args output_assoc_arr <args...>
559580
-antigen-parse-args () {
@@ -1360,7 +1381,7 @@ antigen-use () {
13601381
fi
13611382
}
13621383
antigen-version () {
1363-
local version="v2.2.1"
1384+
local version="develop"
13641385
local extensions revision=""
13651386
if [[ -d $_ANTIGEN_INSTALL_DIR/.git ]]; then
13661387
revision=" ($(git --git-dir=$_ANTIGEN_INSTALL_DIR/.git rev-parse --short '@'))"
@@ -1782,15 +1803,17 @@ typeset -g _ZCACHE_CAPTURE_PREFIX
17821803
cat > $ANTIGEN_CACHE <<EOC
17831804
#-- START ZCACHE GENERATED FILE
17841805
#-- GENERATED: $(date)
1785-
#-- ANTIGEN v2.2.1
1806+
#-- ANTIGEN develop
17861807
$(functions -- _antigen)
17871808
antigen () {
17881809
local MATCH MBEGIN MEND
17891810
[[ "\$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "\$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "$_ANTIGEN_INSTALL_DIR/antigen.zsh" && eval antigen \$@;
17901811
return 0;
17911812
}
1813+
$(export -p _PATH _fpath)
17921814
typeset -gaU fpath path
1793-
fpath+=(${_fpath[@]}) path+=(${_PATH[@]})
1815+
fpath+=(\$_fpath) path+=(\$_PATH)
1816+
unset _fpath _PATH
17941817
_antigen_compinit () {
17951818
autoload -Uz compinit; compinit -d "$ANTIGEN_COMPDUMP"; compdef _antigen antigen
17961819
add-zsh-hook -D precmd _antigen_compinit
@@ -1806,7 +1829,7 @@ ${(j::)_sources}
18061829
#--- BUNDLES END
18071830
typeset -gaU _ANTIGEN_BUNDLE_RECORD; _ANTIGEN_BUNDLE_RECORD=($(print ${(qq)_ANTIGEN_BUNDLE_RECORD}))
18081831
typeset -g _ANTIGEN_CACHE_LOADED; _ANTIGEN_CACHE_LOADED=true
1809-
typeset -g ANTIGEN_CACHE_VERSION; ANTIGEN_CACHE_VERSION='v2.2.1'
1832+
typeset -g ANTIGEN_CACHE_VERSION; ANTIGEN_CACHE_VERSION='develop'
18101833
18111834
#-- END ZCACHE GENERATED FILE
18121835
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)