[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/07: system: Add /etc/bashrc that loads bash-completion when available
From: |
Ludovic Courtès |
Subject: |
05/07: system: Add /etc/bashrc that loads bash-completion when available. |
Date: |
Thu, 12 Mar 2015 21:52:33 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 1d167b6e3779bcc1666b5c7d5ee802170c7023b6
Author: Ludovic Courtès <address@hidden>
Date: Thu Mar 12 22:11:18 2015 +0100
system: Add /etc/bashrc that loads bash-completion when available.
* gnu/system.scm (etc-directory)[profile]: Conditionally source
/etc/bashrc.
[bashrc]: New file. Source bash_completion.sh when available.
---
gnu/system.scm | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index c43a8ed..0d510b6 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -352,6 +352,8 @@ explicitly appear in OS."
e2fsprogs kbd
+ bash-completion
+
;; The packages below are also in %FINAL-INPUTS, so take them from
;; there to avoid duplication.
(map canonical-package
@@ -463,7 +465,25 @@ export GIT_SSL_CAINFO=\"$SSL_CERT_FILE\"
# Allow Aspell to find dictionaries installed in the user profile.
export ASPELL_CONF=\"dict-dir $HOME/.guix-profile/lib/aspell\"
+
+if [ -n \"$BASH_VERSION\" -a -f /etc/bashrc ]
+then
+ # Load Bash-specific initialization code.
+ source /etc/bashrc
+fi
"))
+
+ (bashrc (text-file "bashrc" "\
+# Bash-specific initialization.
+
+# The 'bash-completion' package.
+if [ -f /run/current-system/profile/etc/profile.d/bash_completion.sh ]
+then
+ # Bash-completion sources ~/.bash_completion. It installs a dynamic
+ # completion loader that searches its own completion files as well
+ # as those in ~/.guix-profile and /run/current-system/profile.
+ source /run/current-system/profile/etc/profile.d/bash_completion.sh
+fi\n"))
(skel (skeleton-directory skeletons)))
(file-union "etc"
`(("services" ,#~(string-append #$net-base "/etc/services"))
@@ -477,6 +497,7 @@ export ASPELL_CONF=\"dict-dir
$HOME/.guix-profile/lib/aspell\"
("skel" ,#~#$skel)
("shells" ,#~#$shells)
("profile" ,#~#$profile)
+ ("bashrc" ,#~#$bashrc)
("hosts" ,#~#$hosts-file)
("localtime" ,#~(string-append #$tzdata "/share/zoneinfo/"
#$timezone))
- branch master updated (81ce19f -> b3976e7), Ludovic Courtès, 2015/03/12
- 02/07: system: Add fish, tcsh, and zsh to /etc/shells., Ludovic Courtès, 2015/03/12
- 03/07: gnu: bash-completion: Search for completion modules in profiles., Ludovic Courtès, 2015/03/12
- 04/07: gnu: git: Install Bash completion as 'etc/bash_completion.d/git'., Ludovic Courtès, 2015/03/12
- 05/07: system: Add /etc/bashrc that loads bash-completion when available.,
Ludovic Courtès <=
- 07/07: gnu: skribilo: Add dependency on Ploticus., Ludovic Courtès, 2015/03/12
- 01/07: system: Remove duplicated line from export., Ludovic Courtès, 2015/03/12
- 06/07: gnu: guile-reader: Build with the C locale., Ludovic Courtès, 2015/03/12