From 2457300ac6ae054bb713ab0e91941d74de8ed822 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Tue, 5 Jan 2016 04:08:20 +0100
Subject: [PATCH] module "color": support more locations for DIR_COLORS

---
 modules/color/init | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/color/init b/modules/color/init
index af5561b..e6c8f85 100644
--- a/modules/color/init
+++ b/modules/color/init
@@ -36,12 +36,16 @@ if [[ "`tput colors`" == "256" ]] || [[ "`tput colors`" == "88" ]] ; then
 		hostcolor=$gitclean
 	fi
 	usercolor="%{${FX[bold]}${FG[$usercolor_base]}%}"
-	# 8-color-term
-	if [ -e /etc/DIR_COLORS.256 ] ; then
-		eval "$(dircolors /etc/DIR_COLORS.256)"
-	elif [ -e /etc/DIR_COLORS ]; then
-		eval "$(dircolors /etc/DIR_COLORS)"
-	fi
+
+	for colorfile in /etc/DIR_COLORS.256 \
+	                 /etc/DIR_COLORS.256color \
+	                 /etc/colors/DIR_COLORS.256 \
+					 /etc/colors/DIR_COLORS.256color; do
+		if [ -e $colorfile ] ; then
+			eval "$(dircolors $colorfile)"
+			break;
+		fi
+	done
 else
 	pathcolor="%{$fg_bold[blue]}%}"
 
@@ -70,6 +74,6 @@ else
 			hostcolor="%{${fg_bold[black]}%}"
 		fi
 	fi
-
-	[ -e /etc/DIR_COLORS ] && eval "$(dircolors /etc/DIR_COLORS)"
 fi
+
+[[ -z "$LS_COLORS" ]] && [ -e /etc/DIR_COLORS ] && eval "$(dircolors /etc/DIR_COLORS)"