From 13f70a2c9945d1c89159b1ca036b3a56fbee879e Mon Sep 17 00:00:00 2001
From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Fri, 29 Oct 2004 11:42:08 +0000
Subject: [PATCH] - %addusertogroup macro for RPM

Changed files:
    rpm-user_group.sh -> 1.2
    rpm.macros -> 1.166
---
 rpm-user_group.sh | 8 ++++++++
 rpm.macros        | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/rpm-user_group.sh b/rpm-user_group.sh
index 921bdc2..0d524af 100644
--- 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 a1572a9..d0f48f2 100644
--- 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
-- 
2.44.0