aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/bash-completion-directories.patch
blob: a9b88203bdfefeb233a05ffd183ee9e3ecf8d974 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
Bash-completion is written with FHS in mind where completion scripts
all get added to /usr/share/bash-completion/completions and are picked
up by the dynamic completion loader from there---whether they are
part of bash-completion or installed by another package.

On Guix systems, we want not only to search within bash-completion's own
directory, but also in the user's profile and guix home profile, as well
as in the system profile.
This is what this patch does.


--- a/bash_completion
+++ b/bash_completion
@@ -2173,7 +2173,15 @@ complete -F _minimal ''
 
 __load_completion()
 {
-    local -a dirs=(${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions)
+    local -a dirs=(
+        ${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions
+        "$HOME/.guix-profile/share/bash-completion/completions"
+        "$HOME/.guix-profile/etc/bash_completion.d"
+        "$HOME/.guix-home/profile/share/bash-completion/completions"
+        "$HOME/.guix-home/profile/etc/bash_completion.d"
+        "/run/current-system/profile/share/bash-completion/completions"
+        "/run/current-system/profile/etc/bash_completion.d" )
+
     local ifs=$IFS IFS=: dir cmd="${1##*/}" compfile
     [[ -n $cmd ]] || return 1
     for dir in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do
         dirs+=( $dir/bash-completion/completions )
2cbb9cd96d69c03e9de9ad6fdcfebbee'>services: zabbix-agent: Delete not mandatory hostname configuration....* gnu/services/monitoring.scm (zabbix-agent-configuration)[hostname]: Set to empty string. Oleg Pykhalov 2020-11-05services: Remove imports of (ice-9 …) modules....* gnu/services/monitoring.scm (zabbix-server-activation): Remove (ice-9 rdelim) from the imported modules. (zabbix-agent-activation): Likewise. * gnu/tests/mail.scm (run-exim-test)[test]: Remove (ice-9 ftw) from the imported modules. Ludovic Courtès 2019-11-03gnu: zabbix-agentd: Update to 4.4.1....* gnu/packages/monitoring.scm (zabbix-agentd): Update to 4.4.1. * gnu/services/monitoring.scm (%zabbix-front-end-configuration-nginx): Add listen record field. Oleg Pykhalov 2019-05-22gnu: darkstat-service-type: Fix typo "statistics"....* gnu/services/monitoring (darkstat-service-type)[description]: Fix typo. Vagrant Cascadian 2019-05-15gnu: Update copyright line....* gnu/services/monitoring.scm: Update copyright line. Gábor Boskovits 2019-05-13services: prometheus-node-exporter add default....* gnu/services/monitoring.scm (prometheus-node-exporter-service-type): Add default-value with default configuration. Gábor Boskovits 2019-03-10services: zabbix-front-end: Show location in messages....* gnu/services/monitoring.scm (zabbix-front-end-config): Show location in messages. Oleg Pykhalov 2019-03-04services: Use 'file-append' for user account shells....* gnu/services/cuirass.scm (cuirass-account): Use 'file-append' instead of #~(string-append #$shadow "/sbin/nologin"). * gnu/services/monitoring.scm (zabbix-server-account): Likewise. (zabbix-agent-account): Likewise. * gnu/services/rsync.scm (rsync-account): Likewise. * gnu/services/ssh.scm (%openssh-accounts): Likewise. Ludovic Courtès 2018-12-20services: zabbix-front-end: Tweak error and hint messages....* gnu/services/monitoring.scm (zabbix-front-end-config): Adjust error and hint mssages. Ludovic Courtès 2018-12-19services: zabbix-front-end: Improve hint and error messages....* gnu/services/monitoring.scm (zabbix-front-end-config): Improve hint and error messages. Oleg Pykhalov 2018-12-17services: monitoring: Add 'zabbix-front-end'....* gnu/services/monitoring.scm (nginx-server-configuration-list?, serialize-nginx-server-configuration-list, zabbix-front-end-configuration, zabbix-front-end-config, zabbix-front-end-activation, generate-zabbix-front-end-documentation): New procedures. (%zabbix-front-end-configuration-nginx, %maintenance.inc.php, zabbix-front-end-service-type): New variables. * doc/guix.texi (Monitoring Services): Document this. Oleg Pykhalov 2018-12-17services: monitoring: Add 'zabbix-agent'....* gnu/services/monitoring.scm (zabbix-server-service-type, zabbix-agent-account, zabbix-agent-activation, zabbix-agent-config-file, zabbix-agent-shepherd-service, generate-zabbix-agent-documentation): New procedures. (zabbix-agent-service-type): New 'service-type'. * gnu/tests/monitoring.scm (run-zabbix-server-test): Test 'zabbix-agent'. (%zabbix-os): Add 'zabbix-agent' service. * doc/guix.texi (Monitoring Services): Document 'zabbix-agent'. Oleg Pykhalov 2018-12-17services: monitoring: Add 'zabbix-server'....* gnu/services/monitoring.scm (uglify-field-name, serialize-field, serialize-number, serialize-list, serialize-string, group?, serialize-group, include-files?, serialize-include-files, zabbix-server-account, zabbix-server-config-file, zabbix-server-activation, zabbix-server-shepherd-service, generate-zabbix-server-documentation, extra-options, serialize-extra-options): New procedures. (zabbix-server-service-type): New variable. * gnu/tests/monitoring.scm (%psql-user-create-zabbix, %psql-db-zabbix-create-script, %psql-db-create-zabbix, %psql-db-import-zabbix, %zabbix-os, %test-zabbix): New variables. (run-zabbix-server-test): New procedure. * doc/guix.texi (Monitoring Services): Document 'zabbix-server'. squash! services: monitoring: Add 'zabbix-server'. Oleg Pykhalov 2018-07-09services: Add prometheus-node-exporter-service-type....* gnu/services/monitoring.scm (prometheus-node-exporter-service-type): New variable. (<prometheus-node-exporter-configuration>): New record type. (prometheus-node-exporter-shepherd-service): New procedure. * gnu/doc/guix.texi (Monitoring Services): Document it. * gnu/tests/monitoring.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add test module. Gábor Boskovits 2018-01-08gnu: services: Add darkstat service....* gnu/services/monitoring.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (Monitoring Services): Document it. 宋文武