saving uncommitted changes in /etc prior to emerge run

diff --git a/bash/bashrc.d/._cfg0000_bash_completion.sh b/bash/bashrc.d/._cfg0000_bash_completion.sh
deleted file mode 100644 (file)
index bb0fdb6..0000000
--- a/bash/bashrc.d/._cfg0000_bash_completion.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Check for interactive bash and that we haven't already been sourced.
-if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
-
-    # Check for recent enough version of bash.
-    if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
-       [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
-        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
-            . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
-        if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
-            # Source completion code.
-            . /usr/share/bash-completion/bash_completion
-        fi
-    fi
-
-fi

diff --git a/config-archive/etc/bash/bashrc.d/bash_completion.sh b/config-archive/etc/bash/bashrc.d/bash_completion.sh
new file mode 100644 (file)
index 0000000..ae6756f
--- /dev/null
+++ b/config-archive/etc/bash/bashrc.d/bash_completion.sh
@@ -0,0 +1,16 @@
+# Check for interactive bash and that we haven't already been sourced.
+if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
+
+    # Check for recent enough version of bash.
+    if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
+       [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
+        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+            . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
+        if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
+            # Source completion code.
+            BASH_COMPLETION_COMPAT_DIR=/usr/share/bash-completion/completions
+            . /usr/share/bash-completion/bash_completion
+        fi
+    fi
+
+fi

diff --git a/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new b/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new
new file mode 100644 (file)
index 0000000..bb0fdb6
--- /dev/null
+++ b/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new
@@ -0,0 +1,15 @@
+# Check for interactive bash and that we haven't already been sourced.
+if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
+
+    # Check for recent enough version of bash.
+    if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
+       [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
+        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+            . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
+        if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
+            # Source completion code.
+            . /usr/share/bash-completion/bash_completion
+        fi
+    fi
+
+fi