diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-05-08 09:15:33 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-05-26 13:43:03 +0900 |
| commit | 45b883a9d33ff3bfd0bdb9c9eeea4d64eb73e10c (patch) | |
| tree | f6bf0b80d141166cdf4cd073bd1ffacc685374aa /gnu/system.scm | |
| parent | 4c017ccfe56a8887bf26faaea62d60501d7cc4f6 (diff) | |
system: Migrate sourcing bash_completion.sh to etc-bashrc-d-service-type.
* gnu/system.scm (operating-system-etc-service): Remove block sourcing
bash_completion.sh.
(%base-packages-interactive): Delete bash-completion.
* gnu/services.scm (%default-etc-bashrc-d-files): New variable, which includes
the bash_completion.sh file.
(etc-bashrc-d-service-type): Use it.
* doc/guix.texi (Service Reference): Update documentation.
Change-Id: I2223a5f96f5d761148badc6be29e1c5c80465a1d
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index a571fe4fc75..30f55967c43 100644 --- a/gnu/system.scm +++ b/gnu/system.scm | |||
| @@ -969,7 +969,6 @@ of PROVENANCE-SERVICE-TYPE to its services." | |||
| 969 | nvi | 969 | nvi |
| 970 | man-db | 970 | man-db |
| 971 | info-reader ;the standalone Info reader (no Perl) | 971 | info-reader ;the standalone Info reader (no Perl) |
| 972 | bash-completion | ||
| 973 | kbd | 972 | kbd |
| 974 | ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also | 973 | ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also |
| 975 | ;; want the other commands and the man pages (notably because | 974 | ;; want the other commands and the man pages (notably because |
| @@ -1155,15 +1154,6 @@ fi | |||
| 1155 | # Provide a default prompt. The user's ~/.bashrc can override it. | 1154 | # Provide a default prompt. The user's ~/.bashrc can override it. |
| 1156 | PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ ' | 1155 | PS1='\\u@\\h \\w${GUIX_ENVIRONMENT:+ [env]}\\$ ' |
| 1157 | 1156 | ||
| 1158 | # The 'bash-completion' package. | ||
| 1159 | if [ -f /run/current-system/profile/etc/profile.d/bash_completion.sh ] | ||
| 1160 | then | ||
| 1161 | # Bash-completion sources ~/.bash_completion. It installs a dynamic | ||
| 1162 | # completion loader that searches its own completion files as well | ||
| 1163 | # as those in ~/.guix-profile and /run/current-system/profile. | ||
| 1164 | source /run/current-system/profile/etc/profile.d/bash_completion.sh | ||
| 1165 | fi | ||
| 1166 | |||
| 1167 | for i in /etc/bashrc.d/*.sh; do | 1157 | for i in /etc/bashrc.d/*.sh; do |
| 1168 | [[ -r $i ]] && source \"$i\" | 1158 | [[ -r $i ]] && source \"$i\" |
| 1169 | done | 1159 | done |
