diff mbox

[PATCHv2,2/2] gnu: bash-completion: Update to 2.3. Update the patch.

Message ID 20160807100715.14652-2-sleep_walker@gnu.org
State New
Headers show

Commit Message

Tomáš Čech Aug. 7, 2016, 10:07 a.m. UTC
* gnu/packages/bash.scm(bash-completion): Update to 2.3.
* gnu/packages/patches/bash-completion-directories.patch: New version of
  the patch for the same purpose.
---
 gnu/packages/bash.scm                              |  8 ++---
 .../patches/bash-completion-directories.patch      | 40 +++++++++-------------
 2 files changed, 21 insertions(+), 27 deletions(-)

Comments

Leo Famulari Aug. 8, 2016, 9:14 p.m. UTC | #1
On Sun, Aug 07, 2016 at 12:07:15PM +0200, Tomáš Čech wrote:
> * gnu/packages/bash.scm(bash-completion): Update to 2.3.

Same nit-pick about leaving a space before the variable name :)

> * gnu/packages/patches/bash-completion-directories.patch: New version of
>   the patch for the same purpose.

LGTM
Tomáš Čech Aug. 9, 2016, 9:05 a.m. UTC | #2
On Mon, Aug 08, 2016 at 05:14:41PM -0400, Leo Famulari wrote:
>On Sun, Aug 07, 2016 at 12:07:15PM +0200, Tomáš Čech wrote:
>> * gnu/packages/bash.scm(bash-completion): Update to 2.3.
>
>Same nit-pick about leaving a space before the variable name :)
>
>> * gnu/packages/patches/bash-completion-directories.patch: New version of
>>   the patch for the same purpose.
>
>LGTM

Thanks for review, pushed.

S_W
diff mbox

Patch

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index c006546..bddb830 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -275,15 +275,15 @@  without modification.")
 (define-public bash-completion
   (package
     (name "bash-completion")
-    (version "2.1")
+    (version "2.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "http://bash-completion.alioth.debian.org/files/"
-                    "bash-completion-" version ".tar.bz2"))
+                    "https://github.com/scop/" name "/releases/download/"
+                    version "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"))
+                "1sg82nmsr00ig37skln2qvmi8mgbxgdvycm3ygzs8gbz66pq3q5j"))
               (patches
                (search-patches "bash-completion-directories.patch"))))
     (build-system gnu-build-system)
diff --git a/gnu/packages/patches/bash-completion-directories.patch b/gnu/packages/patches/bash-completion-directories.patch
index 1a3e2f5..351a8e0 100644
--- a/gnu/packages/patches/bash-completion-directories.patch
+++ b/gnu/packages/patches/bash-completion-directories.patch
@@ -7,27 +7,21 @@  On Guix systems, we want not only to search within bash-completion's own
 directory, but also in the user's profile and in the system profile.
 This is what this patch does.
 
---- bash-completion-2.1/bash_completion	2015-03-11 09:45:45.056846446 +0100
-+++ bash-completion-2.1/bash_completion	2015-03-11 09:52:43.248159504 +0100
-@@ -1928,9 +1928,20 @@ _completion_loader()
-     local compfile=./completions
-     [[ $BASH_SOURCE == */* ]] && compfile="${BASH_SOURCE%/*}/completions"
-     compfile+="/${1##*/}"
-+    local base="${1##*/}"
- 
-+    # Look for completion files in the user and global profiles and
-+    # lastly in 'bash-completion' itself.
-+    for file in                                                                 \
-+        "$HOME/.guix-profile/share/bash-completion/completions/$base"           \
-+        "$HOME/.guix-profile/etc/bash_completion.d/$base"                       \
-+        "/run/current-system/profile/share/bash-completion/completions/$base"   \
-+        "/run/current-system/profile/etc/bash_completion.d/$base"               \
-+        "$compfile"
-+    do
-     # Avoid trying to source dirs; https://bugzilla.redhat.com/903540
--    [[ -f "$compfile" ]] && . "$compfile" &>/dev/null && return 124
-+        [[ -f "$file" ]] && . "$file" &>/dev/null && return 124
-+    done
+
+--- a/bash_completion	2016-08-03 10:23:02.356782287 +0200
++++ b/bash_completion	2016-08-03 10:27:50.120140403 +0200
+@@ -1960,7 +1960,13 @@
  
-     # Need to define *something*, otherwise there will be no completion at all.
-     complete -F _minimal "$1" && return 124
+ __load_completion()
+ {
+-    local -a dirs=( ${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions )
++    local -a dirs=(
++        "$HOME/.guix-profile/share/bash-completion/completions/$base"
++        "$HOME/.guix-profile/etc/bash_completion.d/$base"
++        "/run/current-system/profile/share/bash-completion/completions/$base"
++        "/run/current-system/profile/etc/bash_completion.d/$base"
++        ${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions )
++
+     local OIFS=$IFS IFS=: dir cmd="$1" compfile
+     for dir in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do
+         dirs+=( $dir/bash-completion/completions )