From 8f589fbeb2caaa8b646ec5e6c98eeedc0a83ec03 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 22 Jun 2025 15:57:12 +0100 Subject: [PATCH 1/2] build: fix install-data-hook for bash_completion.d It no longer matches bash_completion so it was not substituting for the actual compatdir due to a refactor. Follow-up for cdd8a157abdbb4ce2e74df3fd8131a2b199152e6 --- Makefile.am | 2 +- bash_completion | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 27366b7d9d3..849287645fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,7 @@ EXTRA_DIST = CHANGELOG.md $(pkgdata_DATA) bash_completion.sh.in .dir-locals.el \ install-data-hook: tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \ - $(SED) -e 's|-/etc/bash_completion\.d|-$(compatdir)|' \ + $(SED) -e 's|(/etc/bash_completion\.d|($(compatdir)|' \ $(DESTDIR)$(datadir)/$(PACKAGE)/bash_completion >$$tmpfile && \ cat $$tmpfile >$(DESTDIR)$(datadir)/$(PACKAGE)/bash_completion && \ rm $$tmpfile diff --git a/bash_completion b/bash_completion index 9cedadfac78..bcf8fec0554 100644 --- a/bash_completion +++ b/bash_completion @@ -3490,6 +3490,7 @@ _comp__init_collect_startup_configs() if [[ ${BASH_COMPLETION_COMPAT_DIR-} ]]; then compat_dirs+=("$BASH_COMPLETION_COMPAT_DIR") else + # Keep in sync with install-data-hook at Makefile.am compat_dirs+=(/etc/bash_completion.d) # Similarly as for the "completions" dir, look up from relative to # bash_completion, primarily for installed-with-prefix and From f43a0548ea3c64918e3ac03a1fab37478d469736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 12 Oct 2025 17:23:58 +0000 Subject: [PATCH 2/2] Update bash_completion --- bash_completion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_completion b/bash_completion index bcf8fec0554..4392f67912d 100644 --- a/bash_completion +++ b/bash_completion @@ -3490,7 +3490,7 @@ _comp__init_collect_startup_configs() if [[ ${BASH_COMPLETION_COMPAT_DIR-} ]]; then compat_dirs+=("$BASH_COMPLETION_COMPAT_DIR") else - # Keep in sync with install-data-hook at Makefile.am + # Keep in sync with Makefile.am install-data-hook compat_dirs+=(/etc/bash_completion.d) # Similarly as for the "completions" dir, look up from relative to # bash_completion, primarily for installed-with-prefix and