From 34ffa2ef55d8b8ecfd3d8539f7a07f109726d7c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Fri, 24 Jun 2016 12:45:22 +0200 Subject: [PATCH] change way of detection of interactive shell in colorls.sh script --- coreutils-colorls.sh | 2 +- coreutils.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils-colorls.sh b/coreutils-colorls.sh index cfd2288..ac92268 100755 --- a/coreutils-colorls.sh +++ b/coreutils-colorls.sh @@ -1,7 +1,7 @@ # color-ls initialization # Skip all for noninteractive shells. -[ -z "$PS1" ] && return +[ ! -t 0 ] && return #when USER_LS_COLORS defined do not override user LS_COLORS, but use them. if [ -z "$USER_LS_COLORS" ]; then diff --git a/coreutils.spec b/coreutils.spec index e6cf348..4abace5 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.25 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -351,6 +351,10 @@ fi %license COPYING %changelog +* Fri Jun 24 2016 Ondrej Vasik - 8.25-10 +- change way of detection of interactive shell in colorls.sh script + (#1321648) + * Mon Jun 20 2016 Kamil Dudka - 8.25-9 - add BR for glibc-langpack-en to prevent the expand/mb test from failing - do not use /bin/mv in %%post to avoid a circular dependency (#1348043)