From da5b39c75ce71b95e0f7f6fd01ee4dbc3386a0e0 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 26 Jan 2017 18:32:30 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- bash/bashrc.d/bash_completion.sh | 3 +-- .../{bash_completion.sh.dist.new => bash_completion.sh.dist} | 2 +- cups/subscriptions.conf | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) rename config-archive/etc/bash/bashrc.d/{bash_completion.sh.dist.new => bash_completion.sh.dist} (86%) diff --git a/bash/bashrc.d/bash_completion.sh b/bash/bashrc.d/bash_completion.sh index ae6756f9..6cca5741 100644 --- 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.new b/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist similarity index 86% rename from config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new rename to config-archive/etc/bash/bashrc.d/bash_completion.sh.dist index bb0fdb61..6cca5741 100644 --- a/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new +++ b/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist @@ -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 ] || \ diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 0e9a1426..c5184130 100644 --- 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 Events all @@ -7,6 +7,6 @@ Owner anonymous Recipient dbus:// LeaseDuration 86400 Interval 0 -ExpirationTime 1485414839 +ExpirationTime 1485501179 NextEventId 1 -- 2.39.5