Fixed problem with initial installation

Author: meefik

include/bootstrap/archlinux/deploy.sh

@@ -115,7 +115,8 @@ do_install()
     is_ok "fail" "done"
 
     msg "Installing base packages: "
-    extra_packages=$(chroot_exec -u root /usr/bin/pacman --noconfirm -Sg base | awk '{print $2}' | grep -v -e 'linux' -e 'kernel' | xargs)
+    chroot_exec -u root pacman -Syq
+    extra_packages=$(chroot_exec -u root pacman -Sqg base | grep -v -e 'linux' -e 'kernel' | xargs)
     pacman_install ${basic_packages} ${extra_packages}
     is_ok || return 1
 

include/core/aid/deploy.sh

@@ -6,15 +6,15 @@ do_configure()
 {
     msg ":: Configuring ${COMPONENT} ... "
     # set min uid and gid
-    sed -i 's|^UID_MIN.*|UID_MIN 5000|g' "${CHROOT_DIR}/etc/login.defs"
-    sed -i 's|^GID_MIN.*|GID_MIN 5000|g' "${CHROOT_DIR}/etc/login.defs"
+    sed -i 's|^[#]\?UID_MIN.*|UID_MIN 5000|' "${CHROOT_DIR}/etc/login.defs"
+    sed -i 's|^[#]\?GID_MIN.*|GID_MIN 5000|' "${CHROOT_DIR}/etc/login.defs"
     # add android groups
     local aid uid
     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}|g" "${CHROOT_DIR}/etc/group"
+        sed -i "s|^${xname}:.*|${xname}:x:${xid}:${USER_NAME}|" "${CHROOT_DIR}/etc/group"
         if ! $(grep -q "^${xname}:" "${CHROOT_DIR}/etc/group"); then
             echo "${xname}:x:${xid}:${USER_NAME}" >> "${CHROOT_DIR}/etc/group"
         fi
@@ -25,7 +25,7 @@ do_configure()
         for uid in ${PRIVILEGED_USERS}
         do
             if ! $(grep -q "^${xname}:.*${uid}" "${CHROOT_DIR}/etc/group"); then
-                sed -i "s|^\(${xname}:.*\)|\1,${uid}|g" "${CHROOT_DIR}/etc/group"
+                sed -i "s|^\(${xname}:.*\)|\1,${uid}|" "${CHROOT_DIR}/etc/group"
             fi
         done
     done