ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: Add /etc/bashrc that loads bash-completion when available.

Browse source 
* gnu/system.scm (etc-directory)[profile]: Conditionally source
  /etc/bashrc.
  [bashrc]: New file.  Source bash_completion.sh when available.
This commit is contained in:
Ludovic Courtès 2015-03-12 22:11:18 +01:00
parent be3ed52d7b
commit 1d167b6e37
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/system.scm
View file

@ -352,6 +352,8 @@ (define %base-packages
e2fsprogs kbd e2fsprogs kbd
bash-completion
;; The packages below are also in %FINAL-INPUTS, so take them from ;; The packages below are also in %FINAL-INPUTS, so take them from
;; there to avoid duplication. ;; there to avoid duplication.
(map canonical-package (map canonical-package
@ -463,7 +465,25 @@ (define* (etc-directory #:key
# Allow Aspell to find dictionaries installed in the user profile. # Allow Aspell to find dictionaries installed in the user profile.
export ASPELL_CONF=\"dict-dir $HOME/.guix-profile/lib/aspell\" 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))) (skel (skeleton-directory skeletons)))
(file-union "etc" (file-union "etc"
`(("services" ,#~(string-append #$net-base "/etc/services")) `(("services" ,#~(string-append #$net-base "/etc/services"))
@ -477,6 +497,7 @@ (define* (etc-directory #:key
("skel" ,#~#$skel) ("skel" ,#~#$skel)
("shells" ,#~#$shells) ("shells" ,#~#$shells)
("profile" ,#~#$profile) ("profile" ,#~#$profile)
("bashrc" ,#~#$bashrc)
("hosts" ,#~#$hosts-file) ("hosts" ,#~#$hosts-file)
("localtime" ,#~(string-append #$tzdata "/share/zoneinfo/" ("localtime" ,#~(string-append #$tzdata "/share/zoneinfo/"
#$timezone)) #$timezone))