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

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Thu Feb 14 13:18:19 UTC 2008


Author: ovasik

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

Modified Files:
	coreutils-colorls.csh coreutils-colorls.sh 
Log Message:
fix of build troubles on x86_64


Index: coreutils-colorls.csh
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-colorls.csh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- coreutils-colorls.csh	8 Feb 2008 16:27:31 -0000	1.7
+++ coreutils-colorls.csh	14 Feb 2008 13:17:37 -0000	1.8
@@ -16,7 +16,7 @@
   endif
 endif
 if ( -e "/etc/DIR_COLORS.256color" ) then
-  if ( "`tput colors`" == "256" ) then
+  if ( "`infocmp $TERM | sed -n 's/.*colors#\([0-9]\+\).*/\1/p'`" == "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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- coreutils-colorls.sh	7 Feb 2008 15:10:39 -0000	1.7
+++ coreutils-colorls.sh	14 Feb 2008 13:17:37 -0000	1.8
@@ -7,7 +7,7 @@
   COLORS=/etc/DIR_COLORS
   [ -e "/etc/DIR_COLORS.$TERM" ] && COLORS="/etc/DIR_COLORS.$TERM"
   [ -e "/etc/DIR_COLORS.256color" ] && \
-     [ "`tput colors 2>/dev/null`" = "256" ] && \
+     [ "`infocmp $TERM | sed -n 's/.*colors#\([0-9]\+\).*/\1/p'`" = "256" ] && \
      COLORS="/etc/DIR_COLORS.256color"
   [ -e "$HOME/.dircolors" ] && COLORS="$HOME/.dircolors"
   [ -e "$HOME/.dir_colors" ] && COLORS="$HOME/.dir_colors"




More information about the fedora-extras-commits mailing list