X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-user_group.sh;h=ee662e2153360dced797a5a51348aee562a0dd83;hb=73f65316c81cb411a5c176a83cc680b553279064;hp=43d8148fc4fb9c049ed60d11c0ea4262cb605144;hpb=89b9c531c02fc5dda7608d5b60cbb8a5ae6041f9;p=packages%2Frpm.git

diff --git a/rpm-user_group.sh b/rpm-user_group.sh
index 43d8148..ee662e2 100644
--- a/rpm-user_group.sh
+++ b/rpm-user_group.sh
@@ -14,14 +14,14 @@ fi
 if [ "$1" = user -o "$1" = group ]; then
 	MODE=$1
 else
-	echo ERROR | $BANNERCMD $BANNERPARA
+	echo ERROR
 	exit 2
 fi
 shift
 
 bannercmd()
 {
-	if [ "$BANNERCMD" == cat ]; then
+	if [ "$BANNERCMD" = cat ]; then
 		echo cat
 	else
 		if [ "$RPM_SCRIPTVERBOSITY" -lt 2 ]; then
@@ -63,12 +63,15 @@ elif [ "$1" = del ]; then
 		fi
 	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
-	    echo "Adding user $USER to group $GROUP" | `bannercmd "${MODE}mod-$USER"`
-	    usermod -G "$GROUPS,$GROUP" $USER
+	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