From e88c759f8d4c417239f451ed1ad5b23dd7620248 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Thu, 15 Jun 2006 15:24:58 +0000
Subject: [PATCH] - if [ foo == bar ] bashism kill - drop sed dependency ([[
 foo ]] supported by pdksh) - drop unneccessary banner call on error

Changed files:
    rpm-user_group.sh -> 1.8
---
 rpm-user_group.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rpm-user_group.sh b/rpm-user_group.sh
index d69479a..39b5c67 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,10 +63,10 @@ elif [ "$1" = del ]; then
 		fi
 	fi
 elif [ "$MODE" = "user" -a "$1" = "addtogroup" ]; then
-	CUSER=$2
-	CGROUP=$3
-	CGROUPS=`id -n -G $CUSER | sed -e's/^[^ ]* //;s/ /,/g'`
-	if ! echo ",$CGROUPS," | grep -q ",$CGROUP," ; 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
 	fi
-- 
2.44.0