Author: arekm Date: Wed May 10 05:44:15 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't use USER/GROUP variables (read-only in some shells like bash)
---- Files affected: SOURCES: rpm-user_group.sh (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SOURCES/rpm-user_group.sh diff -u SOURCES/rpm-user_group.sh:1.6 SOURCES/rpm-user_group.sh:1.7 --- SOURCES/rpm-user_group.sh:1.6 Wed Apr 12 15:58:21 2006 +++ SOURCES/rpm-user_group.sh Wed May 10 07:44:10 2006 @@ -63,12 +63,12 @@ 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 + CUSER=$2 + CGROUP=$3 + CGROUPS=`id -n -G $CUSER | sed -e's/^[^ ]* //;s/ /,/g'` + if ! echo ",$CGROUPS," | grep -q ",$CGROUP," ; then + echo "Adding user $CUSER to group $CGROUP" | `bannercmd "${MODE}mod-$CUSER"` + usermod -G "$CGROUPS,$CGROUP" $CUSER fi else echo ERROR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rpm-user_group.sh?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit