- changed behaviour in -n and -t in %%banner

- added banner support to user_group.sh (PLEASE CHECK!)

Changed files:
    rpm-user_group.sh -> 1.3
    rpm.macros -> 1.177

diff --git a/rpm-user_group.sh b/rpm-user_group.sh
index 0d524af3ac65b52506bd5307526c6fd5de247921..59ea36fe6aef861789b6d192f4bc70a431a88f2c 100644 (file)
--- a/rpm-user_group.sh
+++ b/rpm-user_group.sh
@@ -3,14 +3,35 @@
 [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm
 [ -z "$RPM_SCRIPTVERBOSITY" ] && RPM_SCRIPTVERBOSITY=5
 
+if [ -x /usr/bin/banner.sh ]; then
+       BANNERCMD="/usr/bin/banner.sh "
+       BANNERPARA="-s -M user-group.error"
+else
+       BANNERCMD="cat"
+       BANNERPARA=""
+fi
+
 if [ "$1" = user -o "$1" = group ]; then
        MODE=$1
 else
-       echo ERROR
+       echo ERROR | $BANNERCMD $BANNERPARA
        exit 2
 fi
 shift
 
+bannercmd()
+{
+       if [ "$BANNERCMD" == cat ]; then
+               echo cat
+       else
+               if [ "$RPM_SCRIPTVERBOSITY" -lt 2 ]; then
+                       echo "$BANNERCMD -s -M $1"
+               else
+                       echo "$BANNERCMD -M $1"
+               fi
+       fi
+}
+
 testrm()
 {
        [ "$RPM_USERDEL" != yes ] && return 1
@@ -28,7 +49,7 @@ if [ "$1" = "testrm" ]; then
        exit $?
 elif [ "$1" = del ]; then
        if testrm $2; then
-               [ "$RPM_SCRIPTVERBOSITY" -lt 2 ] || echo "Removing $MODE $2"
+               echo "Removing $MODE $2" | `bannercmd "${MODE}del-$2"`
                /usr/sbin/${MODE}del $2 || :
        fi
 elif [ "$MODE" = "user" -a "$1" = "addtogroup" ]; then
@@ -36,7 +57,7 @@ elif [ "$MODE" = "user" -a "$1" = "addtogroup" ]; then
        GROUP=$3
        GROUPS=`id -n -G $USER | sed -e's/^[^ ]* //;s/ /,/g'`
        if ! echo ",$GROUPS," | grep -q ",$GROUP," ; then
-           [ "$RPM_SCRIPTVERBOSITY" -lt 2 ] || echo "Adding user $USER to group $GROUP"
+           echo "Adding user $USER to group $GROUP" | `bannercmd "${MODE}mod-$USER"`
            usermod -G "$GROUPS,$GROUP" $USER
        fi
 else

diff --git a/rpm.macros b/rpm.macros
index 7ecda9b1941680a8eb1ed8d4832c1b444938ca1e..ab87e9388feadab371f61bc05420749a81e6036e 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -493,16 +493,16 @@ fi; \
 # EOF
 # -a   - append to the banner
 # -e   - send to stderr instead of stdout
-# -n   - no show banner (overriden by -t)
-# -t   - show only, if RPM_SCRIPTVERBOSITY >= n
+# -n   - no show banner (overrides -t)
+# -t   - show only, if RPM_SCRIPTVERBOSITY >= n; default n=5
 %banner(a:e:n:t:)      \
 RPM_SCRIPTVERBOSITY=5 \
 [ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
 if [ -x /usr/bin/banner.sh ]; then \
-       CMD="/usr/bin/banner.sh %{-e:--stderr} %{!-t:%{!-n:-s}} %{-t:\`[ $RPM_SCRIPTVERBOSITY -ge %{-t*} ] && 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 \
 %nil
- 
+