doublequote LS_COLORS in colorls.*sh scripts to speedup shell

start(#586029), add patch for mkstemp on sparc64(Dennis Gilmore),
    update /etc/DIR_COLORS* files
This commit is contained in:
Ondrej Vasik 2010-04-27 10:30:50 +00:00
parent 12996d09a1
commit 5421281a0d
7 changed files with 33 additions and 11 deletions

View File

@ -1,5 +1,5 @@
# Configuration file for the color ls utility # Configuration file for the color ls utility
# Synchronized with coreutils 8.1 dircolors # Synchronized with coreutils 8.5 dircolors
# This file goes in the /etc directory, and must be world readable. # 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 # You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults. # the system defaults.
@ -45,9 +45,11 @@ TERM mach-color
TERM mlterm TERM mlterm
TERM putty TERM putty
TERM rxvt TERM rxvt
TERM rxvt-256color
TERM rxvt-cygwin TERM rxvt-cygwin
TERM rxvt-cygwin-native TERM rxvt-cygwin-native
TERM rxvt-unicode TERM rxvt-unicode
TERM rxvt-unicode256
TERM screen TERM screen
TERM screen-256color TERM screen-256color
TERM screen-256color-bce TERM screen-256color-bce
@ -94,7 +96,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 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 STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
# This is for files with execute permission: # This is for files with execute permission:
EXEC 01;32 EXEC 01;32

View File

@ -1,6 +1,6 @@
# Configuration file for the 256color ls utility # Configuration file for the 256color ls utility
# This file goes in the /etc directory, and must be world readable. # This file goes in the /etc directory, and must be world readable.
# Synchronized with coreutils 8.1 dircolors # Synchronized with coreutils 8.5 dircolors
# You can copy this file to .dir_colors in your $HOME directory to override # You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults. # the system defaults.
# In the case that you are not satisfied with supplied colors, please # In the case that you are not satisfied with supplied colors, please
@ -23,6 +23,7 @@ OPTIONS -F -T 0
# Below, there should be one TERM entry for each termtype that is colorizable # Below, there should be one TERM entry for each termtype that is colorizable
TERM putty-256color TERM putty-256color
TERM rxvt-256color TERM rxvt-256color
TERM rxvt-unicode256
TERM screen-256color TERM screen-256color
TERM xterm-256color TERM xterm-256color
TERM gnome-256color TERM gnome-256color

View File

@ -1,5 +1,5 @@
# Configuration file for the color ls utility - modified for gray backgrounds # Configuration file for the color ls utility - modified for gray backgrounds
# Synchronized with coreutils 8.1 dircolors # Synchronized with coreutils 8.5 dircolors
# This file goes in the /etc directory, and must be world readable. # 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 # You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults. # the system defaults.
@ -34,7 +34,9 @@ TERM xterm-16color
TERM xterm-88color TERM xterm-88color
TERM xterm-256color TERM xterm-256color
TERM rxvt TERM rxvt
TERM rxvt-256color
TERM rxvt-unicode TERM rxvt-unicode
TERM rxvt-unicode256
TERM xterm-color TERM xterm-color
TERM color-xterm TERM color-xterm
TERM vt100 TERM vt100

View File

@ -2,7 +2,7 @@
# color-ls initialization # color-ls initialization
if ( $?USER_LS_COLORS ) then if ( $?USER_LS_COLORS ) then
if ( "$USER_LS_COLORS" != "" ) then if ( "$USER_LS_COLORS" != "" ) then
#when USER_LS_COLORS defined do not override user #when USER_LS_COLORS defined do not override user
#specified LS_COLORS and use them #specified LS_COLORS and use them
goto finish goto finish
endif endif
@ -12,14 +12,14 @@ alias ll 'ls -l'
alias l. 'ls -d .*' alias l. 'ls -d .*'
set COLORS=/etc/DIR_COLORS set COLORS=/etc/DIR_COLORS
if ($?TERM) then if ($?TERM) then
if ( -e "/etc/DIR_COLORS.$TERM" ) then if ( -e "/etc/DIR_COLORS.$TERM" ) then
set COLORS="/etc/DIR_COLORS.$TERM" set COLORS="/etc/DIR_COLORS.$TERM"
endif endif
endif endif
if ( -e "/etc/DIR_COLORS.256color" ) then if ( -e "/etc/DIR_COLORS.256color" ) then
if ( "`tty -s && tput colors`" == "256" ) then if ( "`tty -s && tput colors`" == "256" ) then
set COLORS=/etc/DIR_COLORS.256color set COLORS=/etc/DIR_COLORS.256color
endif endif
endif endif
if ( -f ~/.dircolors ) set COLORS=~/.dircolors if ( -f ~/.dircolors ) set COLORS=~/.dircolors
if ( -f ~/.dir_colors ) set COLORS=~/.dir_colors if ( -f ~/.dir_colors ) set COLORS=~/.dir_colors
@ -30,11 +30,11 @@ endif
if ( ! -e "$COLORS" ) exit if ( ! -e "$COLORS" ) exit
eval `dircolors -c $COLORS` eval "`dircolors -c $COLORS`"
if ( "$LS_COLORS" == '' ) exit if ( "$LS_COLORS" == '' ) exit
set color_none=`sed -n '/^COLOR.*none/Ip' < $COLORS` set color_none=`sed -n '/^COLOR.*none/Ip' < $COLORS`
if ( "$color_none" != '' ) then if ( "$color_none" != '' ) then
unset color_none unset color_none
exit exit
endif endif

View File

@ -30,7 +30,7 @@ if [ -z "$USER_LS_COLORS" ]; then
# Existence of $COLORS already checked above. # Existence of $COLORS already checked above.
[ -n "$COLORS" ] || return [ -n "$COLORS" ] || return
eval `dircolors --sh "$COLORS" 2>/dev/null` eval "`dircolors --sh "$COLORS" 2>/dev/null`"
[ -z "$LS_COLORS" ] && return [ -z "$LS_COLORS" ] && return
grep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return grep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
fi fi

9
coreutils-mkstemp.patch Normal file
View File

@ -0,0 +1,9 @@
--- coreutils-7.6/lib/mkstemp.c.BAD 2010-03-03 18:17:52.000000000 +0000
+++ coreutils-7.6/lib/mkstemp.c 2010-03-03 18:18:28.000000000 +0000
@@ -40,5 +40,5 @@
int
mkstemp (char *xtemplate;
{
- return __gen_tempname (xtemplate, 0, 0, __GT_FILE);
+ return __gen_tempname (xtemplate, __GT_FILE);
}

View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.5 Version: 8.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -30,6 +30,8 @@ Patch102: coreutils-7.4-sttytcsadrain.patch
Patch103: coreutils-8.2-uname-processortype.patch Patch103: coreutils-8.2-uname-processortype.patch
#df --direct #df --direct
Patch104: coreutils-df-direct.patch Patch104: coreutils-df-direct.patch
#Fix mkstemp on sparc64
Patch105: coreutils-mkstemp.patch
# sh-utils # sh-utils
#add info about TZ envvar to date manpage #add info about TZ envvar to date manpage
@ -124,6 +126,7 @@ Libraries for coreutils package.
%patch102 -p1 -b .tcsadrain %patch102 -p1 -b .tcsadrain
%patch103 -p1 -b .sysinfo %patch103 -p1 -b .sysinfo
%patch104 -p1 -b .dfdirect %patch104 -p1 -b .dfdirect
%patch105 -p1 -b .sparc
# sh-utils # sh-utils
%patch703 -p1 -b .dateman %patch703 -p1 -b .dateman
@ -338,6 +341,12 @@ fi
%{_libdir}/coreutils %{_libdir}/coreutils
%changelog %changelog
* Tue Apr 27 2010 Ondrej Vasik <ovasik@redhat.com> - 8.5-2
- doublequote LS_COLORS in colorls.*sh scripts to speedup
shell start(#586029)
- add patch for mkstemp on sparc64(Dennis Gilmore)
- update /etc/DIR_COLORS* files
* Mon Apr 26 2010 Ondrej Vasik <ovasik@redhat.com> - 8.5-1 * Mon Apr 26 2010 Ondrej Vasik <ovasik@redhat.com> - 8.5-1
- new upstream release 8.5 - new upstream release 8.5