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/services.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/services.scm')
| -rw-r--r-- | gnu/services.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/services.scm b/gnu/services.scm index 7083c88c130..5dbda176b80 100644 --- a/gnu/services.scm +++ b/gnu/services.scm | |||
| @@ -124,6 +124,7 @@ | |||
| 124 | etc-service-type | 124 | etc-service-type |
| 125 | etc-profile-d-service-type | 125 | etc-profile-d-service-type |
| 126 | etc-bashrc-d-service-type | 126 | etc-bashrc-d-service-type |
| 127 | %default-etc-bashrc-d-files | ||
| 127 | etc-directory | 128 | etc-directory |
| 128 | privileged-program-service-type | 129 | privileged-program-service-type |
| 129 | setuid-program-service-type ; deprecated | 130 | setuid-program-service-type ; deprecated |
| @@ -992,6 +993,10 @@ log in."))) | |||
| 992 | (define files->bashrc-d-directory | 993 | (define files->bashrc-d-directory |
| 993 | (make-files->etc-directory "bashrc.d")) | 994 | (make-files->etc-directory "bashrc.d")) |
| 994 | 995 | ||
| 996 | (define %default-etc-bashrc-d-files | ||
| 997 | (list (file-append bash-completion | ||
| 998 | "/etc/profile.d/bash_completion.sh"))) | ||
| 999 | |||
| 995 | (define etc-bashrc-d-service-type | 1000 | (define etc-bashrc-d-service-type |
| 996 | (service-type | 1001 | (service-type |
| 997 | (inherit etc-profile-d-service-type) | 1002 | (inherit etc-profile-d-service-type) |
| @@ -1000,7 +1005,8 @@ log in."))) | |||
| 1000 | files->bashrc-d-directory))) | 1005 | files->bashrc-d-directory))) |
| 1001 | (description "A service for populating @file{/etc/bashrc.d/} with Bash | 1006 | (description "A service for populating @file{/etc/bashrc.d/} with Bash |
| 1002 | scripts having the @file{.sh} file extension, to be sourced by interactive | 1007 | scripts having the @file{.sh} file extension, to be sourced by interactive |
| 1003 | Bash shells."))) | 1008 | Bash shells.") |
| 1009 | (default-value %default-etc-bashrc-d-files))) | ||
| 1004 | 1010 | ||
| 1005 | (define (privileged-program->activation-gexp programs) | 1011 | (define (privileged-program->activation-gexp programs) |
| 1006 | "Return an activation gexp for privileged-program from PROGRAMS." | 1012 | "Return an activation gexp for privileged-program from PROGRAMS." |
