saving uncommitted changes in /etc prior to emerge run

diff --git a/bash/bashrc.d/bash_completion.sh b/bash/bashrc.d/bash_completion.sh
index ae6756f99e6c30f55338bd3b9bc4815328032efb..6cca57410418951bc4ffe7cb851bd59ed48bfe78 100644 (file)
--- a/bash/bashrc.d/bash_completion.sh
+++ b/bash/bashrc.d/bash_completion.sh
@@ -1,5 +1,5 @@
 # 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
+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 ] || \
@@ -8,7 +8,6 @@ if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
             . "${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

diff --git a/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist b/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist
new file mode 100644 (file)
index 0000000..6cca574
--- /dev/null
+++ b/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist
@@ -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

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
deleted file mode 100644 (file)
index bb0fdb6..0000000
--- a/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new
+++ /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/cups/subscriptions.conf b/cups/subscriptions.conf
index 0e9a1426e3d9944cb69983ab21609e6bbb996bac..c51841304ce7468e7cedb53648afef9f1e21a4aa 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,5 +1,5 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-01-25 08:14
+# Written by cupsd on 2017-01-26 08:13
 NextSubscriptionId 337
 <Subscription 336>
 Events all
@@ -7,6 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1485414839
+ExpirationTime 1485501179
 NextEventId 1
 </Subscription>