diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-04-19 22:46:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-19 23:34:53 +0200 |
| commit | b16b77905cd8c5a33dd5240d2e5c7ae0c4b2cdf6 (patch) | |
| tree | 828b5b0cd8ae443fa57af3101faae715e7c11385 | |
| parent | ee8591990fd38ee2860f0ab659b05052b10f14c6 (diff) | |
gnu: bash-completion: Remove completions redundant with those of util-linux.
* gnu/packages/bash.scm (bash-completion)[arguments]: New field.
| -rw-r--r-- | gnu/packages/bash.scm | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 02cb45c9551..45676f568b4 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #:use-module (gnu packages ncurses) | 23 | #:use-module (gnu packages ncurses) |
| 24 | #:use-module (gnu packages readline) | 24 | #:use-module (gnu packages readline) |
| 25 | #:use-module (gnu packages bison) | 25 | #:use-module (gnu packages bison) |
| 26 | #:use-module (gnu packages linux) | ||
| 26 | #:use-module (guix packages) | 27 | #:use-module (guix packages) |
| 27 | #:use-module (guix download) | 28 | #:use-module (guix download) |
| 28 | #:use-module (guix utils) | 29 | #:use-module (guix utils) |
| @@ -247,6 +248,29 @@ without modification.") | |||
| 247 | (patches | 248 | (patches |
| 248 | (list (search-patch "bash-completion-directories.patch"))))) | 249 | (list (search-patch "bash-completion-directories.patch"))))) |
| 249 | (build-system gnu-build-system) | 250 | (build-system gnu-build-system) |
| 251 | (native-inputs `(("util-linux" ,util-linux))) | ||
| 252 | (arguments | ||
| 253 | `(#:phases (alist-cons-after | ||
| 254 | 'install 'remove-redundant-completions | ||
| 255 | (lambda* (#:key inputs outputs #:allow-other-keys) | ||
| 256 | ;; Util-linux comes with a bunch of completion files for | ||
| 257 | ;; its own commands which are more sophisticated and | ||
| 258 | ;; up-to-date than those of bash-completion. Remove those | ||
| 259 | ;; from bash-completion. | ||
| 260 | (let* ((out (assoc-ref outputs "out")) | ||
| 261 | (util-linux (assoc-ref inputs "util-linux")) | ||
| 262 | (completions (string-append out | ||
| 263 | "/share/bash-completion" | ||
| 264 | "/completions")) | ||
| 265 | (already (find-files (string-append util-linux | ||
| 266 | "/etc/bash_completion.d")))) | ||
| 267 | (with-directory-excursion completions | ||
| 268 | (for-each (lambda (file) | ||
| 269 | (when (file-exists? file) | ||
| 270 | (delete-file file))) | ||
| 271 | (map basename already))) | ||
| 272 | #t)) | ||
| 273 | %standard-phases))) | ||
| 250 | (synopsis "Bash completions for common commands") | 274 | (synopsis "Bash completions for common commands") |
| 251 | (description | 275 | (description |
| 252 | "This package provides extensions that allow Bash to provide adapted | 276 | "This package provides extensions that allow Bash to provide adapted |
