Author: glen Date: Sun Mar 6 10:24:00 2005 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- fix %banner macro:
- now it's possible to call it with <<-EOF or <<EOF'
---- Files affected:
SOURCES:
rpm.macros (1.158.4.20 -> 1.158.4.21)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.20 SOURCES/rpm.macros:1.158.4.21
--- SOURCES/rpm.macros:1.158.4.20 Wed Dec 22 21:18:54 2004
+++ SOURCES/rpm.macros Sun Mar 6 11:23:55 2005
@@ -482,10 +482,13 @@
# banner support (useful in {pre,post}{,un} and triggers)
#
# Usage:
-# %banner name [-a] [-e] [-n] [-tn]
+# %banner name [-a] [-e] [-n] [-tn] <<EOF
# the banner text, the banner text
-# the banner text, and following line HAVE TO BE:
-# EOF
+# the banner text, and following line
+#EOF
+# NOTE:
+# You can use <<'EOF' <<-EOF, or whatever, just remember it must be one word
+#
# -a - append to the banner
# -e - send to stderr instead of stdout
# -n - no show banner (overrides -t)
@@ -494,10 +497,10 @@
RPM_SCRIPTVERBOSITY=5 \
[ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
if [ -x /usr/bin/banner.sh ]; then \
- CMD="/usr/bin/banner.sh %{-e:--stderr} %{!-n:\`[ $RPM_SCRIPTVERBOSITY
-ge %{-t:%{-t*}}%{!-t:5} ] && echo '-s'\`} %{!-a:-m}%{-a:-M} %1" \
+ CMD="/usr/bin/banner.sh %{-e:--stderr} %{!-n:$([ $RPM_SCRIPTVERBOSITY
-ge %{-t:%{-t*}}%{!-t:5} ] && echo -s)} %{!-a:-m}%{-a:-M} %1" \
else \
CMD="cat%{-e: >&2}" \
fi \
-$CMD << EOF \
+$CMD %2 \
%nil
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.20&r2=1.158.4.21&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
