rpms/coreutils/devel coreutils-DIR_COLORS.256color, 1.1, 1.2 coreutils-colorls.csh, 1.5, 1.6 coreutils-colorls.sh, 1.6, 1.7 coreutils-selinux.patch, 1.39, 1.40 coreutils.spec, 1.192, 1.193
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Thu Feb 7 15:11:19 UTC 2008
Author: ovasik
Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17863
Modified Files:
coreutils-DIR_COLORS.256color coreutils-colorls.csh
coreutils-colorls.sh coreutils-selinux.patch coreutils.spec
Log Message:
improve 256-color support handling in colorls shell scripts + color tunning
Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coreutils-DIR_COLORS.256color 25 Jan 2008 17:48:11 -0000 1.1
+++ coreutils-DIR_COLORS.256color 7 Feb 2008 15:10:39 -0000 1.2
@@ -67,19 +67,19 @@
STICKY 48;5;21;38;5;15 # dir with the sticky bit set (+t) and not other-writable
# This is for files with execute permission:
-EXEC 01;38;5;10
+EXEC 01;38;5;34
# List any file extensions like '.gz' or '.tar' that you would like ls
# to colorize below. Put the extension, a space, and the color init string.
# (and any comments you want to add after a '#')
# executables (bright green)
-.cmd 01;38;5;10
-.exe 01;38;5;10
-.com 01;38;5;10
-.btm 01;38;5;10
-.bat 01;38;5;10
-.sh 01;38;5;10
-.csh 01;38;5;10
+.cmd 01;38;5;34
+.exe 01;38;5;34
+.com 01;38;5;34
+.btm 01;38;5;34
+.bat 01;38;5;34
+.sh 01;38;5;34
+.csh 01;38;5;34
# archives or compressed (bright red)
.tar 01;38;5;9
.tgz 01;38;5;9
@@ -148,14 +148,14 @@
.yuv 01;38;5;13
.svg 01;38;5;13
# audio formats (cyan)
-.aac 00;38;5;14
-.au 00;38;5;14
-.flac 00;38;5;14
-.mid 00;38;5;14
-.midi 00;38;5;14
-.mka 00;38;5;14
-.mp3 00;38;5;14
-.mpc 00;38;5;14
-.ogg 00;38;5;14
-.ra 00;38;5;14
-.wav 00;38;5;14
+.aac 00;38;5;45
+.au 00;38;5;45
+.flac 00;38;5;45
+.mid 00;38;5;45
+.midi 00;38;5;45
+.mka 00;38;5;45
+.mp3 00;38;5;45
+.mpc 00;38;5;45
+.ogg 00;38;5;45
+.ra 00;38;5;45
+.wav 00;38;5;45
Index: coreutils-colorls.csh
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-colorls.csh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coreutils-colorls.csh 4 Feb 2008 16:49:24 -0000 1.5
+++ coreutils-colorls.csh 7 Feb 2008 15:10:39 -0000 1.6
@@ -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 2>/dev/null`" == "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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- coreutils-colorls.sh 4 Feb 2008 16:49:24 -0000 1.6
+++ coreutils-colorls.sh 7 Feb 2008 15:10:39 -0000 1.7
@@ -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'`" -eq 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"
coreutils-selinux.patch:
Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- coreutils-selinux.patch 31 Jan 2008 15:55:47 -0000 1.39
+++ coreutils-selinux.patch 7 Feb 2008 15:10:39 -0000 1.40
@@ -508,6 +508,14 @@
x.preserve_security_context = true;
use_default_selinux_context = false;
break;
+@@ -432,6 +432,7 @@ main (int argc, char **argv)
+ break;
+ }
+ scontext = optarg;
++ x.set_security_context = true;
+ use_default_selinux_context = false;
+ break;
+ case_GETOPT_HELP_CHAR;
@@ -825,8 +831,8 @@ Mandatory arguments to long options are
-v, --verbose print the name of each directory as it is created\n\
"), stdout);
Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- coreutils.spec 4 Feb 2008 16:49:24 -0000 1.192
+++ coreutils.spec 7 Feb 2008 15:10:39 -0000 1.193
@@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 6.10
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -291,6 +291,10 @@
/sbin/runuser
%changelog
+* Thu Feb 7 2008 Ondrej Vasik <ovasik at redhat.com> - 6.10-6
+- better 256-color support in colorls shell scripts
+- color tuning(based on feedback in #429121)
+
* Mon Feb 4 2008 Ondrej Vasik <ovasik at redhat.com> - 6.10-5
- enabled 256-color support in colorls shell scripts(#429121)
- fixed syntax error in csh script(#431315)
More information about the fedora-extras-commits
mailing list