Dr. Werner Fink 2015-08-13 06:56:41 +00:00 committed by Git OBS Bridge
parent 518fd8f9d2
commit a65ee80f98
3 changed files with 50 additions and 0 deletions

View File

@ -0,0 +1,41 @@
---
bash_completion | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
--- bash_completion
+++ bash_completion 2015-08-13 06:50:46.873519910 +0000
@@ -945,16 +945,21 @@ _tilde()
_dollar()
{
local s=""
- local -i glob=0
-
+ local -i glob=0 cmd=0
shopt -q extglob && let glob++
((glob == 0)) && shopt -s extglob
[[ "$COMP_LINE" == cd* ]] && s="/"
case "$1" in
- \$\(*|\`*)
- COMPREPLY=($(compgen -c -P '$(' -S ")$s" -- ${1#??})) ;;
+ \$\(*)
+ COMPREPLY=($(compgen -c -P '$(' -S ")$s" -- ${1#??}))
+ let cmd++
+ ;;
+ \`*)
+ COMPREPLY=($(compgen -c -P '\`' -S "\`$s" -- ${1#?}))
+ let cmd++
+ ;;
\$\{*)
COMPREPLY=($(compgen -v -P '${' -S "}$s" -- ${1#??})) ;;
\$*)
@@ -966,7 +971,7 @@ _dollar()
if ((${#COMPREPLY[@]} > 0)) ; then
((${#COMPREPLY[@]} == 1)) && eval COMPREPLY=\(${COMPREPLY[@]}\)
- else
+ elif ((cmd == 0)); then
eval COMPREPLY=\(${1}\)
fi

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 13 06:53:15 UTC 2015 - werner@suse.de
- Add patch backtick-completion-boo940835.patch to allow correct
backtick completion (boo#940835)
-------------------------------------------------------------------
Wed Aug 12 13:17:40 UTC 2015 - werner@suse.de

View File

@ -37,6 +37,8 @@ Patch3: FOO-dir-completion-boo905348.patch
Patch4: init-completion-boo922758.patch
# PATCH-FIX-SUSE boo#889319
Patch5: ls-completion-boo889319.patch
# PATCH-FIX-SUSE boo#940835
Patch6: backtick-completion-boo940835.patch
BuildRequires: pkg-config
Requires: bash
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -54,6 +56,7 @@ of the programmable completion feature of Bash 2.04 and later.
%patch3 -b .p3
%patch4 -b .p4
%patch5 -b .p5
%patch6 -b .p6
%build
%configure