Load user completions from $BASH_COMPLETION_USER_DIR/completions
Fall back to XDG_DATA_HOME/bash-completion/completions or ~/.local/share/bash-completion/completions if not set. Thanks to Raphaël Droz.
This commit is contained in:
parent
caaa4745e4
commit
1d25d72ca8
@ -1960,14 +1960,16 @@ complete -F _minimal ''
|
|||||||
_completion_loader()
|
_completion_loader()
|
||||||
{
|
{
|
||||||
# $1=_EmptycmD_ already for empty cmds in bash 4.3, set to it for earlier
|
# $1=_EmptycmD_ already for empty cmds in bash 4.3, set to it for earlier
|
||||||
local cmd="${1:-_EmptycmD_}" compdir=./completions compfile
|
local cmd="${1:-_EmptycmD_}" compdir=./completions compfile dir
|
||||||
[[ $BASH_SOURCE == */* ]] && compdir="${BASH_SOURCE%/*}/completions"
|
[[ $BASH_SOURCE == */* ]] && compdir="${BASH_SOURCE%/*}/completions"
|
||||||
|
|
||||||
|
for dir in ${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions $compdir; do
|
||||||
for compfile in "${cmd##*/}" "${cmd##*/}".bash _"${cmd##*/}"; do
|
for compfile in "${cmd##*/}" "${cmd##*/}".bash _"${cmd##*/}"; do
|
||||||
compfile="$compdir/$compfile"
|
compfile="$dir/$compfile"
|
||||||
# Avoid trying to source dirs; https://bugzilla.redhat.com/903540
|
# Avoid trying to source dirs; https://bugzilla.redhat.com/903540
|
||||||
[[ -f "$compfile" ]] && . "$compfile" &>/dev/null && return 124
|
[[ -f "$compfile" ]] && . "$compfile" &>/dev/null && return 124
|
||||||
done
|
done
|
||||||
|
done
|
||||||
|
|
||||||
# Need to define *something*, otherwise there will be no completion at all.
|
# Need to define *something*, otherwise there will be no completion at all.
|
||||||
complete -F _minimal -- "$cmd" && return 124
|
complete -F _minimal -- "$cmd" && return 124
|
||||||
|
Loading…
x
Reference in New Issue
Block a user