rpms/coreutils/devel coreutils-colorls.csh, 1.8, 1.9 coreutils-colorls.sh, 1.8, 1.9

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27817

Modified Files:
	coreutils-colorls.csh coreutils-colorls.sh 
Log Message:
x86_64 build error fix #2


Index: coreutils-colorls.csh
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-colorls.csh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- coreutils-colorls.csh	14 Feb 2008 13:17:37 -0000	1.8
+++ coreutils-colorls.csh	14 Feb 2008 14:43:46 -0000	1.9
@@ -16,7 +16,7 @@
   endif
 endif
 if ( -e "/etc/DIR_COLORS.256color" ) then
-  if ( "`infocmp $TERM | sed -n 's/.*colors#\([0-9]\+\).*/\1/p'`" == "256" ) then
+  if ( "`tput colors`" == "256" ) then
      set COLORS=/etc/DIR_COLORS.256color
   endif 
 endif


Index: coreutils-colorls.sh
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-colorls.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- coreutils-colorls.sh	14 Feb 2008 13:17:37 -0000	1.8
+++ coreutils-colorls.sh	14 Feb 2008 14:43:46 -0000	1.9
@@ -7,7 +7,7 @@
   COLORS=/etc/DIR_COLORS
   [ -e "/etc/DIR_COLORS.$TERM" ] && COLORS="/etc/DIR_COLORS.$TERM"
   [ -e "/etc/DIR_COLORS.256color" ] && \
-     [ "`infocmp $TERM | sed -n 's/.*colors#\([0-9]\+\).*/\1/p'`" = "256" ] && \
+     [ "`tput colors 2>/dev/null`" == "256" ] && \
      COLORS="/etc/DIR_COLORS.256color"
   [ -e "$HOME/.dircolors" ] && COLORS="$HOME/.dircolors"
   [ -e "$HOME/.dir_colors" ] && COLORS="$HOME/.dir_colors"