pbrady pushed to coreutils (master). "sync/adjust LS_COLORS (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 20 14:31:58 UTC 2015
>From 0ea2ae63571c7e912cba176b81ec250438388b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Mon, 20 Apr 2015 15:21:51 +0100
Subject: sync/adjust LS_COLORS
* coreutils-DIR_COLORS: sync with upstream
(remove old Xiph formats, add m4a audio format).
* coreutils-DIR_COLORS.256color: Likewise.
Also sync with 8 color mode above, by removing
the specific MULTIHARDLINK coloring, and
giving MISSING symlink targets a red background.
Also lighten the DIR and EXEC color a little
(as discussed in bug 1196642)
* coreutils-DIR_COLORS.lightbgcolor: Sync terminal
types with other 2 databases above.
diff --git a/coreutils-DIR_COLORS b/coreutils-DIR_COLORS
index 6abc937..10ebf7a 100644
--- a/coreutils-DIR_COLORS
+++ b/coreutils-DIR_COLORS
@@ -84,11 +84,11 @@ EIGHTBIT 1
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
#NORMAL 00 # no color code at all
#FILE 00 # normal file, use no color at all
-RESET 0 # reset to "normal" color
+RESET 0 # reset to "normal" color
DIR 01;34 # directory
LINK 01;36 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
-MULTIHARDLINK 00 # regular file with more than one link
+MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;33 # pipe
SOCK 01;35 # socket
DOOR 01;35 # door
@@ -209,8 +209,6 @@ EXEC 01;32
.emf 01;35
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axv 01;35
-.anx 01;35
.ogv 01;35
.ogx 01;35
@@ -218,6 +216,7 @@ EXEC 01;32
.aac 01;36
.au 01;36
.flac 01;36
+.m4a 01;36
.mid 01;36
.midi 01;36
.mka 01;36
@@ -228,8 +227,8 @@ EXEC 01;32
.wav 01;36
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axa 01;36
.oga 01;36
+.opus 01;36
.spx 01;36
.xspf 01;36
diff --git a/coreutils-DIR_COLORS.256color b/coreutils-DIR_COLORS.256color
index 4efaca1..5290aea 100644
--- a/coreutils-DIR_COLORS.256color
+++ b/coreutils-DIR_COLORS.256color
@@ -55,17 +55,17 @@ EIGHTBIT 1
#NORMAL 00 # global default, no color code at all
#FILE 00 # normal file, use no color at all
RESET 0 # reset to "normal" color
-DIR 38;5;27 # directory
+DIR 38;5;33 # directory
LINK 38;5;51 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
-MULTIHARDLINK 44;38;5;15 # regular file with more than one link
+MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;38;5;11 # pipe
SOCK 38;5;13 # socket
DOOR 38;5;5 # door
BLK 48;5;232;38;5;11 # block device driver
CHR 48;5;232;38;5;3 # character device driver
ORPHAN 48;5;232;38;5;9 # symlink to nonexistent file, or non-stat'able file
-MISSING 05;48;5;232;38;5;15 # ... and the files they point to
+MISSING 01;05;37;41 # ... and the files they point to
SETUID 48;5;196;38;5;15 # file that is setuid (u+s)
SETGID 48;5;11;38;5;16 # file that is setgid (g+s)
CAPABILITY 48;5;196;38;5;226 # file with capability
@@ -74,7 +74,7 @@ OTHER_WRITABLE 48;5;10;38;5;21 # dir that is other-writable (o+w) and not sticky
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 38;5;34
+EXEC 38;5;40
# 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.
@@ -179,8 +179,6 @@ EXEC 38;5;34
.emf 38;5;13
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axv 38;5;13
-.anx 38;5;13
.ogv 38;5;13
.ogx 38;5;13
@@ -188,6 +186,7 @@ EXEC 38;5;34
.aac 38;5;45
.au 38;5;45
.flac 38;5;45
+.m4a 38;5;45
.mid 38;5;45
.midi 38;5;45
.mka 38;5;45
@@ -198,8 +197,8 @@ EXEC 38;5;34
.wav 38;5;45
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axa 38;5;45
.oga 38;5;45
+.opus 38;5;45
.spx 38;5;45
.xspf 38;5;45
diff --git a/coreutils-DIR_COLORS.lightbgcolor b/coreutils-DIR_COLORS.lightbgcolor
index 43820b2..bf3e5b3 100644
--- a/coreutils-DIR_COLORS.lightbgcolor
+++ b/coreutils-DIR_COLORS.lightbgcolor
@@ -1,4 +1,4 @@
-# Configuration file for the color ls utility - modified for gray backgrounds
+# Configuration file for the color ls utility - modified for lighter backgrounds
# Synchronized with coreutils 8.5 dircolors
# This file goes in the /etc directory, and must be world readable.
# You can copy this file to .dir_colors in your $HOME directory to override
@@ -16,8 +16,9 @@ COLOR tty
OPTIONS -F -T 0
# Below, there should be one TERM entry for each termtype that is colorizable
-TERM linux
-TERM console
+TERM Eterm
+TERM ansi
+TERM color-xterm
TERM con132x25
TERM con132x30
TERM con132x43
@@ -29,20 +30,46 @@ TERM con80x43
TERM con80x50
TERM con80x60
TERM cons25
-TERM xterm
-TERM xterm-16color
-TERM xterm-88color
-TERM xterm-256color
+TERM console
+TERM cygwin
+TERM dtterm
+TERM eterm-color
+TERM gnome
+TERM gnome-256color
+TERM jfbterm
+TERM konsole
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM mlterm
+TERM putty
+TERM putty-256color
TERM rxvt
TERM rxvt-256color
+TERM rxvt-cygwin
+TERM rxvt-cygwin-native
TERM rxvt-unicode
TERM rxvt-unicode-256color
TERM rxvt-unicode256
-TERM xterm-color
-TERM color-xterm
+TERM screen
+TERM screen-256color
+TERM screen-256color-bce
+TERM screen-bce
+TERM screen-w
+TERM screen.Eterm
+TERM screen.rxvt
+TERM screen.linux
+TERM st
+TERM st-256color
+TERM terminator
TERM vt100
-TERM dtterm
-TERM color_xterm
+TERM xterm
+TERM xterm-16color
+TERM xterm-256color
+TERM xterm-88color
+TERM xterm-color
+TERM xterm-debian
# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
EIGHTBIT 1
@@ -57,7 +84,7 @@ EIGHTBIT 1
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
#NORMAL 00 # no color code at all
#FILE 00 # normal file, use no color at all
-RESET 0
+RESET 0 # reset to "normal" color
DIR 00;34 # directory
LINK 00;36 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
@@ -76,7 +103,6 @@ STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
-
# This is for files with execute permission:
EXEC 00;32
@@ -182,8 +208,6 @@ EXEC 00;32
.emf 00;35
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axv 00;35
-.anx 00;35
.ogv 00;35
.ogx 00;35
@@ -191,6 +215,7 @@ EXEC 00;32
.aac 00;36
.au 00;36
.flac 00;36
+.m4a 00;36
.mid 00;36
.midi 00;36
.mka 00;36
@@ -201,8 +226,8 @@ EXEC 00;32
.wav 00;36
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axa 00;36
.oga 00;36
+.opus 00;36
.spx 00;36
.xspf 00;36
diff --git a/coreutils.spec b/coreutils.spec
index 71c57ff..b482fa2 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.23
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -373,6 +373,9 @@ fi
%{_sbindir}/chroot
%changelog
+* Mon Apr 20 2015 Pádraig Brady <pbrady at redhat.com> - 8.23-9
+- Adjust LS_COLORS in 256 color mode; brighten some, remove hardlink colors (#1196642)
+
* Sun Mar 22 2015 Peter Robinson <pbrobinson at fedoraproject.org> 8.23-8
- Drop large ancient docs
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/coreutils.git/commit/?h=master&id=0ea2ae63571c7e912cba176b81ec250438388b14
More information about the scm-commits
mailing list