- Apply upstream patch to fix quoting issues with bash 4.x (#490322).
This commit is contained in:
parent
742eb987e3
commit
9e76db8cfc
30
bash-completion-1.0-bash4quoting-490322.patch
Normal file
30
bash-completion-1.0-bash4quoting-490322.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From: Mike Kelly <pioto@pioto.org>
|
||||
Date: Thu, 2 Apr 2009 15:16:46 +0000 (-0400)
|
||||
Subject: Fix _filedir on bash 4.
|
||||
X-Git-Url: http://git.debian.org/?p=bash-completion%2Fbash-completion.git;a=commitdiff_plain;h=1421e55aac075e13491cd212b796bdd453214a2c
|
||||
|
||||
Fix _filedir on bash 4.
|
||||
|
||||
We don't need to double-quote things for compgen w/ bash 4. Just putting
|
||||
each file in double quotes is sufficient.
|
||||
|
||||
See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
|
||||
---
|
||||
|
||||
diff --git a/bash_completion b/bash_completion
|
||||
index 0246cd8..4d21cf8 100644
|
||||
--- a/bash_completion
|
||||
+++ b/bash_completion
|
||||
@@ -209,6 +209,12 @@ quote()
|
||||
# results in the original argument
|
||||
quote_readline()
|
||||
{
|
||||
+ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then
|
||||
+ # This function isn't really necessary on bash 4
|
||||
+ # See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
|
||||
+ echo "${1}"
|
||||
+ return
|
||||
+ fi
|
||||
local t="${1//\\/\\\\}"
|
||||
echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
Name: bash-completion
|
||||
Version: 1.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Programmable completion for Bash
|
||||
|
||||
@ -11,6 +11,8 @@ Source0: http://bash-completion.alioth.debian.org/files/%{name}-%{version
|
||||
Source1: %{name}-mock
|
||||
Source2: %{name}-plague-client
|
||||
Source3: %{name}-repomanage
|
||||
# http://git.debian.org/?p=bash-completion/bash-completion.git;a=commitdiff;h=1421e55aac075e13491cd212b796bdd453214a2c
|
||||
Patch0: %{name}-1.0-bash4quoting-490322.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildArch: noarch
|
||||
@ -25,6 +27,7 @@ of the programmable completion feature of bash 2.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
install -pm 644 %{SOURCE1} contrib/mock
|
||||
install -pm 644 %{SOURCE2} contrib/plague-client
|
||||
install -pm 644 %{SOURCE3} contrib/repomanage
|
||||
@ -265,6 +268,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Apr 7 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.0-2
|
||||
- Apply upstream patch to fix quoting issues with bash 4.x (#490322).
|
||||
|
||||
* Mon Apr 6 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.0-1
|
||||
- 1.0.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user