- rewritten %%banner macro (now is much safer)

- req. macro rev. 1.175
- rel .3
- %%banner works for me

Changed files:
    rpm.macros -> 1.175

diff --git a/rpm.macros b/rpm.macros
index 352d041c9a7cc90a6435e9b9903925a462189728..49bf992d78955c646031e4de80f67eadf4dd7565 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -495,7 +495,13 @@ fi; \
 # -n   - no show banner (overriden by -t)
 # -t   - show only, if RPM_SCRIPTVERBOSITY >= n
 %banner(a:n:t:)        \
-       [ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm || RPM_SCRIPTVERBOSITY=5; \
-       %{_bindir}/banner.sh %{!-t:%{!-n:-s}} %{-t:`[ $RPM_SCRIPTVERBOSITY -ge %{-t*} ] && echo "-s"`} %{!-a:-m}%{-a:-M} %1 << EOF\
+RPM_SCRIPTVERBOSITY=5 \
+[ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
+if [ -x /usr/bin/banner.sh ]; then \
+       CMD="/usr/bin/banner.sh %{!-t:%{!-n:-s}} %{-t:\`[ $RPM_SCRIPTVERBOSITY -ge %{-t*} ] && echo '-s'\`} %{!-a:-m}%{-a:-M} %1" \
+else \
+       CMD="cat" \
+fi \
+$CMD << EOF \
 %nil
-
+