Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with PATH if bundle directory contains spaces #582

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix issue with PATH if bundle directory contains spaces #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad87542
Fix issue with spaces in PATH vars
JohnStarich Jul 16, 2017
c5e8611
Use typeset instead of export for clarity
JohnStarich Jul 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.2.1
develop
10 changes: 6 additions & 4 deletions bin/antigen.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,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 '@'))"
Expand Down Expand Up @@ -1782,15 +1782,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;
}
$(typeset -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
Expand All @@ -1806,7 +1808,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
Expand Down
4 changes: 3 additions & 1 deletion src/ext/cache.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ antigen () {
[[ "\$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "\$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "$_ANTIGEN_INSTALL_DIR/antigen.zsh" && eval antigen \$@;
return 0;
}
$(typeset -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
Expand Down