Compare commits

..

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

6 changed files with 50 additions and 89 deletions

View File

@ -1 +1 @@
2260342127086cfedd4801f796fdaaa051411a14 SOURCES/bash-completion-2.7.tar.xz 731834de11a2fea2992002c528dc9d39f0cb9fdc SOURCES/bash-completion-2.11.tar.xz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/bash-completion-2.7.tar.xz SOURCES/bash-completion-2.11.tar.xz

View File

@ -1,35 +0,0 @@
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -121,6 +121,31 @@ A. No. Use `M-/` to (in the words of the bash man page) attempt file
A. Put them in `~/.bash_completion`, which is parsed at the end of the
main completion script. See also the next question.
+**Q. How can I override a completion shipped by bash-completion?**
+
+A. Install a local completion of your own appropriately for the desired
+ command, and it will take precedence over the one shipped by us. See the
+ next answer for details where to install it, if you are doing it on per
+ user basis. If you want to do it system wide, you can install eagerly
+ loaded files in `compatdir` (see a couple of questions further down for
+ more info) and install a completion for the commands to override
+ completions shipped by us.
+
+ If you want to use bash's default completion instead of one of ours,
+ something like this should work (where `$cmd` is the command to override
+ completion for): `complete -o default -o bashdefault $cmd`
+
+**Q. Where should I install my own local completions?**
+
+A. Put them in the `completions` subdir of `$BASH_COMPLETION_USER_DIR`
+ (defaults to `$XDG_DATA_HOME/bash-completion` or
+ `~/.local/share/bash-completion`
+ if `$XDG_DATA_HOME` is not set) to have them loaded on demand.
+ See also the next question's answer for considerations for these
+ files' names, they apply here as well. Alternatively, you can write
+ them directly in `~/.bash_completion` which is loaded eagerly by
+ our main script.
+
**Q. I author/maintain package X and would like to maintain my own
completion code for this package. Where should I put it to be sure
that interactive bash shells will find it and source it?**

View File

@ -1,14 +0,0 @@
diff --git a/completions/man b/completions/man
--- a/completions/man
+++ b/completions/man
@@ -53,9 +53,7 @@ _man()
return
fi
- local manpath="$MANPATH"
- [[ -z $manpath ]] && \
- manpath=$( manpath 2>/dev/null || command man -w 2>/dev/null )
+ local manpath=$( manpath 2>/dev/null || command man -w 2>/dev/null )
[[ -z $manpath ]] && manpath="/usr/share/man:/usr/local/share/man"
# determine manual section to search

View File

@ -1,27 +0,0 @@
diff --git a/completions/Makefile.am b/completions/Makefile.am
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -315,7 +315,7 @@ bashcomp_DATA = 2to3 \
reportbug \
_reptyr \
resolvconf \
- rfkill \
+ _rfkill \
ri \
rmlist \
rmmod \
diff --git a/completions/rfkill b/completions/_rfkill
similarity index 86%
rename from completions/rfkill
rename to completions/_rfkill
--- a/completions/rfkill
+++ b/completions/_rfkill
@@ -1,5 +1,8 @@
# bash completion for rfkill -*- shell-script -*-
+# Use of this file is deprecated on systems with util-linux >= 2.31, which
+# ships completion for the rfkill included with it.
+
_rfkill()
{
local cur prev words cword

View File

@ -4,8 +4,8 @@
%global _python_bytecompile_errors_terminate_build 0 %global _python_bytecompile_errors_terminate_build 0
Name: bash-completion Name: bash-completion
Version: 2.7 Version: 2.11
Release: 5%{?dist} Release: 4%{?dist}
Epoch: 1 Epoch: 1
Summary: Programmable completion for Bash Summary: Programmable completion for Bash
@ -14,11 +14,6 @@ URL: https://github.com/scop/bash-completion
Source0: https://github.com/scop/bash-completion/releases/download/%{version}/%{name}-%{version}.tar.xz Source0: https://github.com/scop/bash-completion/releases/download/%{version}/%{name}-%{version}.tar.xz
# https://bugzilla.redhat.com/677446, see also redefine_filedir comments # https://bugzilla.redhat.com/677446, see also redefine_filedir comments
Patch0: %{name}-1.99-noblacklist.patch Patch0: %{name}-1.99-noblacklist.patch
# It should be removed while rebasing to bash-completion-2.8
Patch1: %{name}-rfkill.patch
# It should be removed while rebasing to bash-completion-2.8
Patch2: %{name}-manpath.patch
Patch3: %{name}-2.9-override-completions.patch
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
@ -29,6 +24,7 @@ BuildRequires: tcllib
# Needed for rfkill patch as it modifies Makefile.am # Needed for rfkill patch as it modifies Makefile.am
# It should be removed while rebasing to bash-completion-2.8 # It should be removed while rebasing to bash-completion-2.8
BuildRequires: automake BuildRequires: automake
BuildRequires: make
Requires: bash >= 4.1 Requires: bash >= 4.1
%description %description
@ -69,7 +65,7 @@ rm %{buildroot}%{_datadir}/bash-completion/completions/{cowsay,cowthink}
%check %check
# For some tests involving non-ASCII filenames # For some tests involving non-ASCII filenames
export LANG=en_US.UTF-8 export LANG=C.UTF-8
%if %{with tests} %if %{with tests}
# This stuff borrowed from dejagnu-1.4.4-17 (tests need a terminal) # This stuff borrowed from dejagnu-1.4.4-17 (tests need a terminal)
tmpfile=$(mktemp) tmpfile=$(mktemp)
@ -95,9 +91,50 @@ make -C completions check
%changelog %changelog
* Mon Aug 13 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.7-5 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.11-4
- Document how to override default completions - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Resolves: #1575573 Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.11-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 8 13:20:44 CET 2021 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.11-1
- Rebase to version 2.11
Resolves: #1782254
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jan 10 2019 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.8-5
- Add completion for rpm -q --licensefiles
Resolves: #1578811
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:2.8-4
- Use C.UTF-8 locale
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
* Mon Aug 13 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.8-3
- Document how to turn off default completions
Resolves: #1575571
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 12 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.8-1
- Update to 2.8
Resolves: #1561241
* Wed Mar 14 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.7-4 * Wed Mar 14 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.7-4
- Do not use $MANPATH directly - Do not use $MANPATH directly