From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v3 06/29] completion: zsh: update slave script locations
Date: Tue, 27 Oct 2020 20:06:49 -0600 [thread overview]
Message-ID: <20201028020712.442623-7-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201028020712.442623-1-felipe.contreras@gmail.com>
Update the default locations of typical system bash-completion,
including the default bash-completion location for user scripts, and the
recommended way to find the system location (with pkg-config).
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.zsh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 5d6740c6ff..ccf384ba35 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -13,7 +13,7 @@
# fpath=(~/.zsh $fpath)
#
# You need git's bash completion script installed. By default bash-completion's
-# location will be used (e.g. /usr/share/bash-completion/completions/git).
+# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
#
# If your bash completion script is somewhere else, you can specify the
# location in your ~/.zshrc:
@@ -33,12 +33,16 @@ zstyle -T ':completion:*:*:git:*' tag-order && \
zstyle -s ":completion:*:*:git:*" script script
if [ -z "$script" ]; then
local -a locations
- local e
+ local e bash_completion
+
+ bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
+ bash_completion='/usr/share/bash-completion/completions/'
+
locations=(
"$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
- '/etc/bash_completion.d/git' # fedora, old debian
- '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
- '/usr/share/bash-completion/git' # gentoo
+ "$HOME/.local/share/bash-completion/completions/git"
+ "$bash_completion/git"
+ '/etc/bash_completion.d/git' # old debian
)
for e in $locations; do
test -f $e && script="$e" && break
--
2.29.1
next prev parent reply other threads:[~2020-10-29 0:28 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 2:06 [PATCH v3 00/29] completion: zsh: latest patches Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 01/29] completion: zsh: fix __gitcomp_direct() Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 02/29] completion: zsh: fix name due to broken autoloading Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 03/29] completion: zsh: fix bash script extension Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 04/29] completion: zsh: reorganize install instructions Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 05/29] completion: zsh: fix for directories with spaces Felipe Contreras
2020-10-28 2:06 ` Felipe Contreras [this message]
2020-10-28 2:06 ` [PATCH v3 07/29] completion: prompt: fix color for Zsh Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 08/29] completion: zsh: fix for command aliasing Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 09/29] completion: bash: synchronize zsh wrapper Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 10/29] completion: bash: remove " Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 11/29] completion: zsh: fix completion for --no-.. options Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 12/29] completion: fix conflict with bashcomp Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 13/29] completion: zsh: add missing direct_append Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 14/29] completion: zsh: fix splitting of words Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 15/29] completion: zsh: simplify compadd functions Felipe Contreras
2020-10-28 2:06 ` [PATCH v3 16/29] completion: zsh: simplify direct compadd Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 17/29] completion: zsh: trivial cleanup Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 18/29] completion: zsh: simplify nl_append Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 19/29] completion: zsh: simplify file_direct Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 20/29] completion: zsh: shuffle functions around Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 21/29] completion: zsh: refactor command completion Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 22/29] completion: zsh: improve command tags Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 23/29] completion: zsh: add alias descriptions Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 24/29] completion: zsh: trivial simplification Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 25/29] completion: zsh: add simple version check Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 26/29] completion: bash: trivial cleanup Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 27/29] completion: bash: cleanup cygwin check Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 28/29] completion: bash: remove old compat wrappers Felipe Contreras
2020-10-28 2:07 ` [PATCH v3 29/29] Update copyright notices Felipe Contreras
2020-10-29 17:43 ` [PATCH v3 00/29] completion: zsh: latest patches Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201028020712.442623-7-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).