feat: load compatdir from /usr/share too and install our script there

In distributions we are in the process of moving data shipped
by upstream projects to /usr/ and out of /etc/, as the latter
is really meant to be for local changes, not for upstream
projects to ship programs/data.

Add support for sourcing compat scripts from
/usr/share/bash-completion/compat/ together with
/etc/bash_completion.d, and move 000_bash_completion_compat.bash
to the former.

Author: bluca

Makefile.am

@@ -3,7 +3,7 @@ SUBDIRS = completions doc helpers test
 pkgdata_DATA = bash_completion
 
 # Empty, but here just to get the compat dir created with install
-compatdir = $(sysconfdir)/bash_completion.d
+compatdir = $(datadir)/bash-completion/compat
 compat_DATA = bash_completion.d/000_bash_completion_compat.bash
 
 profiledir = $(sysconfdir)/profile.d
@@ -36,7 +36,8 @@ 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|($(sysconfdir)/bash_completion.d|' \
+	    -e 's|(/usr/share/bash-completion/compat|($(compatdir)|' \
 	    $(DESTDIR)$(datadir)/$(PACKAGE)/bash_completion >$$tmpfile && \
 	cat $$tmpfile >$(DESTDIR)$(datadir)/$(PACKAGE)/bash_completion && \
 	rm $$tmpfile

bash_completion

@@ -3425,6 +3425,7 @@ _comp__init_collect_startup_configs()
         compat_dirs+=("$BASH_COMPLETION_COMPAT_DIR")
     else
         # Keep in sync with install-data-hook at Makefile.am
+        compat_dirs+=(/usr/share/bash-completion/compat)
         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
@@ -3436,7 +3437,7 @@ _comp__init_collect_startup_configs()
         else
             compat_dir=$_comp__base_directory/bash_completion.d
         fi
-        [[ ${compat_dirs[0]} == "$compat_dir" ]] ||
+        [[ ${compat_dirs[0]} == "$compat_dir" ]] || [[ ${compat_dirs[1]} == "$compat_dir" ]] ||
             compat_dirs+=("$compat_dir")
     fi
     for compat_dir in "${compat_dirs[@]}"; do