From: "Arthur Zamarin" <arthurzam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoo-bashcomp:master commit in: completions/
Date: Wed, 22 May 2024 05:08:49 +0000 (UTC) [thread overview]
Message-ID: <1716354478.3c6e22334e041e6816e0e069e94f8d77da078631.arthurzam@gentoo> (raw)
commit: 3c6e22334e041e6816e0e069e94f8d77da078631
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 05:07:58 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May 22 05:07:58 2024 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/commit/?id=3c6e2233
ebuild: fix, refactor and update completion
Closes: https://bugs.gentoo.org/403123
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
completions/ebuild | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/completions/ebuild b/completions/ebuild
index a268355..b86eee8 100644
--- a/completions/ebuild
+++ b/completions/ebuild
@@ -1,6 +1,6 @@
# Gentoo Linux Bash Shell Command Completion
#
-# Copyright 1999-2013 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2 or later
#
@@ -8,25 +8,26 @@
#
_ebuild()
{
- local cur opts
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
+ local i noopts seenf cur=${COMP_WORDS[COMP_CWORD]}
+ local cmds=(
+ help setup clean fetch digest manifest unpack compile test preinst
+ install postinst qmerge merge unmerge prerm postrm config package rpm
+ configure prepare instprep
+ )
+ local opts=( --debug --force --ignore-default-opts --skip-manifest --help )
- opts="help setup clean fetch digest manifest unpack compile test preinst \
- install postinst qmerge merge unmerge prerm postrm config package rpm \
- configure prepare"
+ for (( i=1 ; i < ${COMP_CWORD} ; i++ )) ; do
+ [[ ${noopts} || ${COMP_WORDS[$i]/#-*} ]] && seenf=1
+ [[ ${COMP_WORDS[$i]} == "--" ]] && noopts=1
+ done
- if [[ $COMP_CWORD -eq 1 ]] ; then
- COMPREPLY=($(compgen -f -X "!*.ebuild" -- ${cur}) \
- $(compgen -d -- ${cur}) \
- $(compgen -W '--debug --force --help --ignore-default-opts --skip-manifest' -- ${cur}))
-
- elif [[ $COMP_CWORD -eq 2 && "${COMP_WORDS[1]}" = "--debug --force --ignore-default-opts --skip-manifest" ]] ; then
- COMPREPLY=($(compgen -f -X "!*.ebuild" -- ${cur}) $(compgen -d -- ${cur}))
-
- elif [[ $COMP_CWORD -ge 2 ]] ; then
- COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ if [[ ${seenf} ]] ; then
+ COMPREPLY=( $(compgen -W '${cmds[*]}' -- "${cur}") )
+ else
+ _filedir ebuild
fi
+
+ [[ ${noopts} ]] || COMPREPLY+=( $(compgen -W '${opts[*]}' -- "${cur}") )
return 0
} &&
complete -o filenames -F _ebuild ebuild
next reply other threads:[~2024-05-22 5:08 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 5:08 Arthur Zamarin [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-25 16:31 [gentoo-commits] proj/gentoo-bashcomp:master commit in: completions/ Arthur Zamarin
2024-06-07 10:20 Arthur Zamarin
2024-06-07 10:20 Arthur Zamarin
2024-05-27 18:50 Arthur Zamarin
2024-05-22 4:53 Arthur Zamarin
2024-05-21 19:25 Arthur Zamarin
2024-05-21 19:18 Arthur Zamarin
2024-05-21 18:34 Arthur Zamarin
2024-05-21 17:50 Arthur Zamarin
2024-05-15 20:09 Arthur Zamarin
2024-05-15 19:25 Arthur Zamarin
2024-05-15 19:25 Arthur Zamarin
2024-05-15 19:25 Arthur Zamarin
2024-05-15 19:25 Arthur Zamarin
2024-05-15 19:25 Arthur Zamarin
2024-05-15 19:25 Arthur Zamarin
2024-05-15 19:25 Arthur Zamarin
2024-05-15 19:25 Arthur Zamarin
2024-05-11 3:12 Sam James
2024-05-11 3:12 Sam James
2024-02-25 20:14 Sam James
2024-02-21 7:34 Sam James
2024-02-21 7:34 Sam James
2024-02-21 7:34 Sam James
2024-02-21 7:23 Sam James
2023-03-13 21:27 Sam James
2023-01-14 16:38 Sam James
2018-06-23 22:23 Patrice Clement
2018-03-02 18:35 William Hubbs
2018-03-02 18:06 Michał Górny
2018-03-02 18:06 Michał Górny
2018-03-02 18:06 Michał Górny
2014-08-31 21:19 ` Michał Górny
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1716354478.3c6e22334e041e6816e0e069e94f8d77da078631.arthurzam@gentoo \
--to=arthurzam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox