Changed a format for privileged users to UID:GID

Author: meefik

cli.sh

@@ -6,7 +6,7 @@
 #
 ################################################################################
 
-VERSION="2.5.0"
+VERSION="2.5.1"
 
 ################################################################################
 # Common

include/core/aid/deploy.sh

@@ -21,23 +21,30 @@ do_configure()
     fi
     # add android groups
     if [ -n "${PRIVILEGED_USERS}" ]; then
-        local aid uid
+        local aid usr
         for aid in $(cat "${COMPONENT_DIR}/android_groups")
         do
             local xname=$(echo ${aid} | awk -F: '{print $1}')
             local xid=$(echo ${aid} | awk -F: '{print $2}')
-            sed -i "s|^${xname}:.*|${xname}:x:${xid}:${USER_NAME}|" "${CHROOT_DIR}/etc/group"
+            sed -i "s|^${xname}:.*|${xname}:x:${xid}:|" "${CHROOT_DIR}/etc/group"
             if ! $(grep -q "^${xname}:" "${CHROOT_DIR}/etc/group"); then
-                echo "${xname}:x:${xid}:${USER_NAME}" >> "${CHROOT_DIR}/etc/group"
+                echo "${xname}:x:${xid}:" >> "${CHROOT_DIR}/etc/group"
             fi
             if ! $(grep -q "^${xname}:" "${CHROOT_DIR}/etc/passwd"); then
                 echo "${xname}:x:${xid}:${xid}::/:/bin/false" >> "${CHROOT_DIR}/etc/passwd"
             fi
-            # add users to aid_inet group
-            for uid in ${PRIVILEGED_USERS}
+            # add users to Android group
+            for usr in ${PRIVILEGED_USERS}
             do
-                if ! $(grep -q "^${xname}:.*${uid}" "${CHROOT_DIR}/etc/group"); then
-                    sed -i "s|^\(${xname}:.*\)|\1,${uid}|" "${CHROOT_DIR}/etc/group"
+                local uid=${usr%%:*}
+                local gid=${usr##*:}
+                if [ "${uid}" = "${gid}" ]; then
+                    gid="${xname}"
+                elif [ "${gid}" != "${xname}" ]; then
+                    continue
+                fi
+                if ! $(grep -q "^${gid}:.*${uid}" "${CHROOT_DIR}/etc/group"); then
+                    sed -i "s|^\(${gid}:.*\)|\1,${uid}|" "${CHROOT_DIR}/etc/group"
                 fi
             done
         done
@@ -49,7 +56,8 @@ do_help()
 {
 cat <<EOF
    --privileged-users="${PRIVILEGED_USERS}"
-     A list of users separated by a space to be added to Android groups.
+     A list of users separated by a space to be added to Android groups. Use
+     a format UID:GID.
 
 EOF
 }