From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 15 Jun 2006 16:19:07 +0000 (+0000)
Subject: - assemble usermod -G arg properly
X-Git-Tag: auto/ac/rpm-build-macros-1_309-1~2
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=45abb9e94c0b0acdf7f2d7085501f03162cb60a3;p=packages%2Frpm.git

- assemble usermod -G arg properly

Changed files:
    rpm-user_group.sh -> 1.9
---

diff --git a/rpm-user_group.sh b/rpm-user_group.sh
index 39b5c67..ee662e2 100644
--- a/rpm-user_group.sh
+++ b/rpm-user_group.sh
@@ -63,12 +63,15 @@ elif [ "$1" = del ]; then
 		fi
 	fi
 elif [ "$MODE" = "user" -a "$1" = "addtogroup" ]; then
-	CUSER="$2"
-	CGROUP="$3"
-	CGROUPS=$(id -n -G $CUSER)
-	if [[ " $CGROUPS " != *\ $CGROUP\ * ]]; then
-	    echo "Adding user $CUSER to group $CGROUP" | `bannercmd "${MODE}mod-$CUSER"`
-	    usermod -G "$CGROUPS,$CGROUP" $CUSER
+	user="$2"
+	group="$3"
+	groups=$(id -n -G $user)
+	if [[ " $groups " != *\ $group\ * ]]; then
+	    echo "Adding user $user to group $group" | `bannercmd "${MODE}mod-$user"`
+		for grp in $groups $group; do
+			new="$new${new:+,}$grp"
+		done
+	    usermod -G "$new" $user
 	fi
 else
 	echo ERROR