Fix issue with spaces in PATH vars

zsh-users · Jul 16, 2017 · 1fe7819 · 1fe7819
1 parent 1d212d1
commit 1fe7819
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.2.1
+develop
diff --git a/bin/antigen.zsh b/bin/antigen.zsh
@@ -554,6 +554,27 @@ antigen () {
     fi
   done
 }
+zmodload zsh/datetime
+ANTIGEN_DEBUG_LOG=${ANTIGEN_DEBUG_LOG:-${ADOTDIR:-$HOME/.antigen}/debug.log}
+LOG () {
+  local PREFIX="[LOG][${EPOCHREALTIME}]"
+  echo "${PREFIX} ${funcfiletrace[1]}\n${PREFIX} $@" >> $ANTIGEN_DEBUG_LOG
+}
+
+ERR () {
+  local PREFIX="[ERR][${EPOCHREALTIME}]"
+  echo "${PREFIX} ${funcfiletrace[1]}\n${PREFIX} $@" >> $ANTIGEN_DEBUG_LOG
+}
+
+WARN () {
+  local PREFIX="[WRN][${EPOCHREALTIME}]"
+  echo "${PREFIX} ${funcfiletrace[1]}\n${PREFIX} $@" >> $ANTIGEN_DEBUG_LOG
+}
+
+TRACE () {
+  local PREFIX="[TRA][${EPOCHREALTIME}]"
+  echo "${PREFIX} ${funcfiletrace[1]}\n${PREFIX} $@\n${PREFIX} ${(j:\n:)funcstack}" >> $ANTIGEN_DEBUG_LOG
+}
 # Usage:
 #   -antigen-parse-args output_assoc_arr <args...>
 -antigen-parse-args () {
@@ -1360,7 +1381,7 @@ antigen-use () {
   fi
 }
 antigen-version () {
-  local version="v2.2.1"
+  local version="develop"
   local extensions revision=""
   if [[ -d $_ANTIGEN_INSTALL_DIR/.git ]]; then
     revision=" ($(git --git-dir=$_ANTIGEN_INSTALL_DIR/.git rev-parse --short '@'))"
@@ -1782,15 +1803,17 @@ typeset -g _ZCACHE_CAPTURE_PREFIX
 cat > $ANTIGEN_CACHE <<EOC
 #-- START ZCACHE GENERATED FILE
 #-- GENERATED: $(date)
-#-- ANTIGEN v2.2.1
+#-- ANTIGEN develop
 $(functions -- _antigen)
 antigen () {
   local MATCH MBEGIN MEND
   [[ "\$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "\$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "$_ANTIGEN_INSTALL_DIR/antigen.zsh" && eval antigen \$@;
   return 0;
 }
+$(export -p _PATH _fpath)
 typeset -gaU fpath path
-fpath+=(${_fpath[@]}) path+=(${_PATH[@]})
+fpath+=(\$_fpath) path+=(\$_PATH)
+unset _fpath _PATH
 _antigen_compinit () {
   autoload -Uz compinit; compinit -d "$ANTIGEN_COMPDUMP"; compdef _antigen antigen
   add-zsh-hook -D precmd _antigen_compinit
@@ -1806,7 +1829,7 @@ ${(j::)_sources}
 #--- BUNDLES END
 typeset -gaU _ANTIGEN_BUNDLE_RECORD; _ANTIGEN_BUNDLE_RECORD=($(print ${(qq)_ANTIGEN_BUNDLE_RECORD}))
 typeset -g _ANTIGEN_CACHE_LOADED; _ANTIGEN_CACHE_LOADED=true
-typeset -g ANTIGEN_CACHE_VERSION; ANTIGEN_CACHE_VERSION='v2.2.1'
+typeset -g ANTIGEN_CACHE_VERSION; ANTIGEN_CACHE_VERSION='develop'
 
 #-- END ZCACHE GENERATED FILE
 EOC

diff --git a/src/ext/cache.zsh b/src/ext/cache.zsh
@@ -41,8 +41,10 @@ antigen () {
   [[ "\$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "\$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "$_ANTIGEN_INSTALL_DIR/antigen.zsh" && eval antigen \$@;
   return 0;
 }
+$(export -p _PATH _fpath)
 typeset -gaU fpath path
-fpath+=(${_fpath[@]}) path+=(${_PATH[@]})
+fpath+=(\$_fpath) path+=(\$_PATH)
+unset _fpath _PATH
 _antigen_compinit () {
   autoload -Uz compinit; compinit -d "$ANTIGEN_COMPDUMP"; compdef _antigen antigen
   add-zsh-hook -D precmd _antigen_compinit