- revert, stat() fails on directories

[packages/coreutils.git] / fileutils.sh

diff --git a/fileutils.sh b/fileutils.sh
index 241f541927f71f176da37d1a0d6031f592bf40f4..d28d074d9ba421cd2d505d74cb1890254c6cdc22 100644 (file)
--- a/fileutils.sh
+++ b/fileutils.sh
@@ -2,9 +2,12 @@ SYS_RC_FILE=/etc/DIR_COLORS
 USER_RC_FILE=$HOME/.dir_colors
 DEF_COLOR_MODE=tty
 
-COLOR_MODE=`grep ^COLOR $SYS_RC_FILE |head -n 1|cut -c 7-`
+COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $SYS_RC_FILE`
 
-[ -r $USER_RC_FILE ] && COLOR_MODE=`grep ^COLOR $USER_RC_FILE |head -n 1|cut -c 7-`
+[ -r $USER_RC_FILE ] && COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $USER_RC_FILE`
+
+# 'all' argument for 'ls --color=' is no longer valid
+[ "$COLOR_MODE" = all ] && COLOR_MODE=always
 
 [ -z "$COLOR_MODE" ] && COLOR_MODE=$DEF_COLOR_MODE
 
@@ -15,3 +18,5 @@ if [ -r $USER_RC_FILE ]; then
 else   
        eval `/usr/bin/dircolors -b $SYS_RC_FILE`
 fi
+
+unset SYS_RC_FILE USER_RC_FILE DEF_COLOR_MODE COLOR_MODE