guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/05: gnu: btrfs-progs: Fix bash completions.


From: Marius Bakke
Subject: 05/05: gnu: btrfs-progs: Fix bash completions.
Date: Sat, 17 Feb 2018 10:17:13 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit 3ce4e265ddefc1f4d5a22ea110e8e6448d55b3a9
Author: Marius Bakke <address@hidden>
Date:   Sat Feb 17 15:56:01 2018 +0100

    gnu: btrfs-progs: Fix bash completions.
    
    This is a follow-up to commit 9a1c4a981bdd7eeca76aaf73a57d6841918821c2.  
Bash
    completions must have the same name as the executable.
    
    * gnu/packages/linux.scm (btrfs-progs)[arguments]: Rename "btrfs-completion"
    script to "btrfs".
---
 gnu/packages/linux.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bc1c658..b99c172 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3245,10 +3245,12 @@ and copy/paste text in the console and in xterm.")
                    (lambda _ (zero? (system* "make" "static"))))
                  (add-after 'install 'install-bash-completion
                    (lambda* (#:key outputs #:allow-other-keys)
-                     (install-file "btrfs-completion"
-                                   (string-append (assoc-ref outputs "out")
-                                                  "/etc/bash_completion.d"))
-                     #t))
+                     (let* ((out (assoc-ref outputs "out"))
+                            (bashcomp (string-append out 
"/etc/bash_completion.d")))
+                       (mkdir-p bashcomp)
+                       (copy-file "btrfs-completion"
+                                  (string-append bashcomp "/btrfs"))
+                       #t)))
                  (add-after 'install 'install-static
                    (let ((staticbin (string-append (assoc-ref %outputs 
"static")
                                                   "/bin")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]