diff --git a/coreutils-colorls.csh b/coreutils-colorls.csh index 2d259a8..317cd0c 100755 --- a/coreutils-colorls.csh +++ b/coreutils-colorls.csh @@ -17,7 +17,7 @@ if ($?TERM) then endif endif if ( -e "/etc/DIR_COLORS.256color" ) then - if ( "`tput colors`" == "256" ) then + if ( "`tty -s && tput colors`" == "256" ) then set COLORS=/etc/DIR_COLORS.256color endif endif diff --git a/coreutils-colorls.sh b/coreutils-colorls.sh index 928667e..f4d6400 100755 --- a/coreutils-colorls.sh +++ b/coreutils-colorls.sh @@ -18,7 +18,7 @@ if [ -z "$USER_LS_COLORS" ]; then done [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.256color" ] && \ - [ "x`tput colors 2>/dev/null`" = "x256" ] && \ + [ "x`tty -s && tput colors 2>/dev/null`" = "x256" ] && \ COLORS="/etc/DIR_COLORS.256color" if [ -z "$COLORS" ]; then diff --git a/coreutils.spec b/coreutils.spec index dfa141a..5efab8e 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 8.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -337,6 +337,10 @@ fi %{_libdir}/coreutils %changelog +* Sat Mar 20 2010 Ondrej Vasik - 8.4-6 +- run tput colors in colorls profile.d scripts only + in the interactive mode(#450424) + * Fri Feb 12 2010 Ondrej Vasik - 8.4-5 - fix exit status of terminated child processes in su with pam(#559098)