From e8fe3e1cf6f9271fa350f4a213fb40600cccff34 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Wed, 17 Jul 2013 14:30:46 +0200 Subject: [PATCH] change the TMP variable name in colorls.csh to _tmp (#981373) --- coreutils-colorls.csh | 11 ++++++----- coreutils.spec | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/coreutils-colorls.csh b/coreutils-colorls.csh index fbe97b7..d02fe85 100755 --- a/coreutils-colorls.csh +++ b/coreutils-colorls.csh @@ -31,14 +31,14 @@ set INCLUDE="`cat "$COLORS" | grep '^INCLUDE' | cut -d ' ' -f2-`" if ( ! -e "$COLORS" ) exit -set TMP="`mktemp .colorlsXXX --tmpdir=/tmp`" +set _tmp="`mktemp .colorlsXXX --tmpdir=/tmp`" -if ( "$INCLUDE" != '' ) cat "$INCLUDE" > $TMP -grep -v '^INCLUDE' "$COLORS" >> $TMP +if ( "$INCLUDE" != '' ) cat "$INCLUDE" > $_tmp +grep -v '^INCLUDE' "$COLORS" >> $_tmp -eval "`dircolors -c $TMP`" +eval "`dircolors -c $_tmp`" -rm -f $TMP +rm -f $_tmp if ( "$LS_COLORS" == '' ) exit set color_none=`sed -n '/^COLOR.*none/Ip' < $COLORS` @@ -47,6 +47,7 @@ if ( "$color_none" != '' ) then exit endif unset color_none +unset _tmp finish: alias ll 'ls -l --color=auto' diff --git a/coreutils.spec b/coreutils.spec index c894c9a..a43745c 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.21 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -375,6 +375,9 @@ fi %{_sbindir}/chroot %changelog +* Wed Jul 17 2013 Ondrej Oprala 8.21-15 +- change the TMP variable name in colorls.csh to _tmp (#981373) + * Fri May 17 2013 Ondrej Vasik