- %addusertogroup macro for RPM

Changed files:
    rpm-user_group.sh -> 1.2
    rpm.macros -> 1.166

diff --git a/rpm-user_group.sh b/rpm-user_group.sh
index 921bdc2259bd2a27f0aee15b56ff082ecb0e49b3..0d524af3ac65b52506bd5307526c6fd5de247921 100644 (file)
--- a/rpm-user_group.sh
+++ b/rpm-user_group.sh
@@ -31,6 +31,14 @@ elif [ "$1" = del ]; then
                [ "$RPM_SCRIPTVERBOSITY" -lt 2 ] || echo "Removing $MODE $2"
                /usr/sbin/${MODE}del $2 || :
        fi
+elif [ "$MODE" = "user" -a "$1" = "addtogroup" ]; then
+       USER=$2
+       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"
+           usermod -G "$GROUPS,$GROUP" $USER
+       fi
 else
        echo ERROR
        exit 2

diff --git a/rpm.macros b/rpm.macros
index a1572a941dd286bd1c175cc6be32075c666f1ba7..d0f48f271bc00079422dfaf4b91ca3576f78dd85 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -467,3 +467,9 @@ fi; \
 #
 %usertestrm    /usr/lib/rpm/user_group.sh user testrm
 %grouptestrm   /usr/lib/rpm/user_group.sh group testrm
+# user group membership management macros
+#
+# Usage:
+#      %addusertogroup myuser agroup
+#
+%addusertogroup        /usr/lib/rpm/user_group.sh user addtogroup