- revert, stat() fails on directories

[packages/coreutils.git] / fileutils.sh

diff --git a/fileutils.sh b/fileutils.sh
index c895b18680d7670278536fb1015bda3931486f43..d28d074d9ba421cd2d505d74cb1890254c6cdc22 100644 (file)
--- a/fileutils.sh
+++ b/fileutils.sh
@@ -1,2 +1,22 @@
-alias  ls="ls --color=tty"
-eval `/usr/bin/dircolors -b /etc/DIR_COLORS`
+SYS_RC_FILE=/etc/DIR_COLORS
+USER_RC_FILE=$HOME/.dir_colors
+DEF_COLOR_MODE=tty
+
+COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $SYS_RC_FILE`
+
+[ -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
+
+alias ls="ls --color=$COLOR_MODE"
+
+if [ -r $USER_RC_FILE ]; then
+       eval `/usr/bin/dircolors -b $USER_RC_FILE`
+else   
+       eval `/usr/bin/dircolors -b $SYS_RC_FILE`
+fi
+
+unset SYS_RC_FILE USER_RC_FILE DEF_COLOR_MODE COLOR_MODE