zsh/zdharma-continuum.zinit
1
0
Fork 0
mirror of https://github.com/zdharma-continuum/zinit.git synced 2026-09-10 07:36:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

zplugin: Better place for expanding pick'' ice (#49)

Browse source
This commit is contained in:
Sebastian Gniazdowski 2018-05-30 17:06:07 +02:00
parent 845b2e46f3
commit f75d69754e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
zplugin.zsh
View file

@ -1048,7 +1048,6 @@ builtin setopt noaliases
(( -- ZPLGM[SHADOWING] == 0 )) && { ZPLGM[SHADOWING]="inactive"; builtin setopt noaliases; (( ${+ZPLGM[bkp-compdef]} )) && functions[compdef]="${ZPLGM[bkp-compdef]}" || unfunction "compdef"; builtin setopt aliases; }
elif [[ -n "${opts[(r)--command]}" || "${ZPLG_ICE[as]}" = "command" ]]; then
# Subversion - directory and multiple files possible
ZPLG_ICE[pick]="${ZPLG_ICE[pick]//\$ZPFX/${ZPFX%/}}"
if (( ${+ZPLG_ICE[svn]} )); then
if [[ -n ${ZPLG_ICE[pick]} ]]; then
list=( $local_dir/$filename/${~ZPLG_ICE[pick]}(N) ${(M)~ZPLG_ICE[pick]##/*}(N) )
@ -1156,7 +1155,6 @@ builtin setopt noaliases
if [[ "${ZPLG_ICE[as]}" = "command" ]]; then
reply=()
if [[ -n ${ZPLG_ICE[pick]} ]]; then
ZPLG_ICE[pick]="${ZPLG_ICE[pick]//\$ZPFX/${ZPFX%/}}"
reply=( $pdir_path/${~ZPLG_ICE[pick]}(N) ${(M)~ZPLG_ICE[pick]##/*}(N) )
[[ -n "${reply[1-correct]}" ]] && pdir_path="${reply[1-correct]:h}"
fi
@ -1294,6 +1292,7 @@ builtin setopt noaliases
[[ "$bit" = (#b)(from|proto|depth|wait|load|unload|if|blockf|svn|pick|nopick|src|bpick|as|ver|silent|lucid|mv|cp|atinit|atload|atpull|atclone|make|nomake|nosvn|service|compile)(*) ]] && ZPLG_ICE[${match[1]}]="${match[2]}"
done
[[ "${ZPLG_ICE[as]}" = "program" ]] && ZPLG_ICE[as]="command"
ZPLG_ICE[pick]="${ZPLG_ICE[pick]//\$ZPFX/${ZPFX%/}}"
} # }}}
# FUNCTION: -zplg-pack-ice {{{
# Remembers long-live ICE specs, assigns them to concrete plugin.