From: Frank Brehm Date: Tue, 20 Dec 2016 13:05:41 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=5a63c50c2a38b47b47d7e2448e9f20979fdede7d;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/bash/bashrc.d/fbrehm.sh b/bash/bashrc.d/fbrehm.sh index 3bbd05b..eacd56d 100644 --- a/bash/bashrc.d/fbrehm.sh +++ b/bash/bashrc.d/fbrehm.sh @@ -61,6 +61,7 @@ match_lhs="" && type -P dircolors >/dev/null \ && match_lhs=$(dircolors --print-database) [[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true +[[ "${TERM}" =~ screen-[0-9][0-9]*color ]] && use_color=true if ${use_color} ; then # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 diff --git a/portage/make.conf b/portage/make.conf index e0960a7..41c59db 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -54,3 +54,6 @@ GENTOO_MIRRORS="http://mirror.netcologne.de/gentoo/" PORTDIR="/usr/portage" DISTDIR="${PORTDIR}/distfiles" PKGDIR="${PORTDIR}/packages" + +source /var/lib/layman/make.conf +