- added stderr support for %%banner

- req. macro rev. 1.176
- rel. .4

Changed files:
    banner.sh -> 1.2
    rpm.spec -> 1.603

diff --git a/banner.sh b/banner.sh
index 666f27539d537a89db1b12c7fe118361849231c0..0b30b2a55147f8bb9d4c082d8a423dfd2e62aee8 100644 (file)
--- a/banner.sh
+++ b/banner.sh
@@ -16,7 +16,8 @@ CONFIG=/etc/sysconfig/banner
 BANNERDIR="/var/lib/banner/"
 # egrep regexp
 EXCLUDEFILES="(rpmnew$|rpmsave$|~$)"
-
+STDOUT="1"  # stdout by default
+#STDOUT="2" # stderr by default
 
 # config paramaeters
 ##########################
@@ -42,6 +43,11 @@ NEW_APPEND=0
 NEW_BANNER=""
 NEW_SHOW=0
 
+case $STDOUT in
+       [1-9]) ;;
+       *) STDOUT="1" ;;
+esac
+
 #################################################### FUNCTIONS ########
 
 Usage()
@@ -72,6 +78,8 @@ Help()
 --older     - all choosen banners should be older than following para in seconds
 -s
 --show      - shows wanted banners
+--stderr    - send banner to stderr instead of stdout (or other)
+--stdout    - send banner to stdout instead of stderr (or other)
 -u
 --usage     - shows short help
 
@@ -149,7 +157,7 @@ make_banner()
 }
 show_banner()
 {
-       cat $BANNERDIR/$1
+       cat $BANNERDIR/$1 >&$STDOUT
 }
 show_banners()
 {
@@ -223,6 +231,12 @@ while [ ! -z $1 ]; do
                        NEW_SHOW=1
                        ACTION="show"
                        ;;
+               --stdout)
+                       STDOUT="1"
+                       ;;
+               --stderr)
+                       STDOUT="2"
+                       ;;
                -u|--usage)
                        Usage
                        exit 0

diff --git a/rpm.spec b/rpm.spec
index a7c0dab2cb07f966d9126105e6cd77ec39a70ab6..ee9b6fe58b2b6af9351ea6bb78ded624242a39e7 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@
 %define        reqdb_ver       4.2.50-1
 %define        reqpopt_ver     1.9
 %define        beecrypt_ver    2:4.1.0
-%define        rpm_macros_rev  1.175
+%define        rpm_macros_rev  1.176
 Summary:       RPM Package Manager
 Summary(de):   RPM Packet-Manager
 Summary(es):   Gestor de paquetes RPM
@@ -32,7 +32,7 @@ Name:         rpm
 %define        ver     4.4
 %define        sover   4.4
 Version:       %{ver}
-Release:       0.%{snap}.0.3
+Release:       0.%{snap}.0.4
 License:       GPL
 Group:         Base
 #Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz