From afb54f6cdb1095ebb78ae3e300ee4b1ed49488d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 15 Jan 2008 21:25:40 +0000 Subject: [PATCH] - move whole %banner expansion to subshell, heredoc redirection works now too Changed files: rpm.macros -> 1.415 --- rpm.macros | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rpm.macros b/rpm.macros index 37a687a..579a3b8 100644 --- a/rpm.macros +++ b/rpm.macros @@ -811,7 +811,7 @@ fi; \ # -e - send to stderr instead of stdout # -n - no show banner (overrides -t) # -t - show only, if RPM_SCRIPTVERBOSITY >= n; default n=5 -%banner(aent:) \{ \ +%banner(aent:) ( \ RPM_SCRIPTVERBOSITY=5 \ [ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \ if [ -x /usr/bin/banner.sh ]; then \ @@ -819,8 +819,7 @@ if [ -x /usr/bin/banner.sh ]; then \ else \ CMD="cat%{-e: >&2}" \ fi \ -eval $CMD %{?2:%2}%{?3: %3} \ -\}; %{nil} +eval $CMD %{?2:%2}%{?3: %3})%{nil} # useradd/groupadd macros # Author: Elan Ruusamäe -- 2.44.0