[fix] : Fixed user_check func

Author: Hayao0819

modules/share/airootfs.any/root/customize_airootfs.sh

@@ -113,17 +113,10 @@ if [[ -f "/etc/skel/Desktop/calamares.desktop" ]]; then
 fi
 
 
-# Creating a root user.
-# usermod -s /usr/bin/zsh root
+# user_check <name>
 function user_check () {
-    if [[ $(getent passwd $1 > /dev/null ; printf $?) = 0 ]]; then
-        if [[ -z $1 ]]; then
-            echo -n "false"
-        fi
-        echo -n "true"
-    else
-        echo -n "false"
-    fi
+    if [[ ! -v 1 ]]; then return 2; fi
+    getent passwd "${1}" > /dev/null
 }
 
 # Execute only if the command exists
@@ -163,7 +156,7 @@ function create_user () {
     fi
     set -u
 
-    if [[ $(user_check ${_username}) = false ]]; then
+    if user_check "${_username}"; then
         useradd -m -s ${usershell} ${_username}
         groupadd sudo
         usermod -U -g ${_username} ${_username}

system/aur.sh

@@ -12,32 +12,17 @@ aur_username="aurbuild"
 
 trap 'exit 1' 1 2 3 15
 
-# Delete file only if file exists
-# remove <file1> <file2> ...
-function remove () {
-    local _list
+# Show message when file is removed
+# remove <file> <file> ...
+remove() {
     local _file
-    _list=($(echo "$@"))
-    for _file in "${_list[@]}"; do
-        if [[ -f ${_file} ]]; then
-            rm -f "${_file}"
-        elif [[ -d ${_file} ]]; then
-            rm -rf "${_file}"
-        fi
-        echo "${_file} was deleted."
-    done
+    for _file in "${@}"; do echo "Removing ${_file}" >&2; rm -rf "${_file}"; done
 }
 
 # user_check <name>
 function user_check () {
-    if [[ $(getent passwd $1 > /dev/null ; printf $?) = 0 ]]; then
-        if [[ -z $1 ]]; then
-            echo -n "false"
-        fi
-        echo -n "true"
-    else
-        echo -n "false"
-    fi
+    if [[ ! -v 1 ]]; then return 2; fi
+    getent passwd "${1}" > /dev/null
 }
 
 # Creating a aur user.
@@ -51,8 +36,7 @@ echo "${aur_username} ALL=(ALL) NOPASSWD:ALL" > "/etc/sudoers.d/aurbuild"
 
 # Setup keyring
 pacman-key --init
-#eval $(cat "/etc/systemd/system/pacman-init.service" | grep 'ExecStart' | sed "s|ExecStart=||g" )
-ls "/usr/share/pacman/keyrings/"*".gpg" | sed "s|.gpg||g" | xargs | pacman-key --populate
+pacman-key --populate
 
 # Un comment the mirror list.
 #sed -i "s/#Server/Server/g" "/etc/pacman.d/mirrorlist"

system/pkgbuild.sh

@@ -29,13 +29,8 @@ function remove () {
 
 # user_check <name>
 function user_check () {
-    if [[ -z "${1}" ]]; then
-        return 1
-    elif getent passwd "${1}" > /dev/null; then
-        return 0
-    else
-        return 1
-    fi
+    if [[ ! -v 1 ]]; then return 2; fi
+    getent passwd "${1}" > /dev/null
 }
 
 # 一般ユーザーで実行します
@@ -62,8 +57,7 @@ echo "${build_username} ALL=(ALL) NOPASSWD:ALL" > "/etc/sudoers.d/pkgbuild"
 
 # Setup keyring
 pacman-key --init
-#eval $(cat "/etc/systemd/system/pacman-init.service" | grep 'ExecStart' | sed "s|ExecStart=||g" )
-ls "/usr/share/pacman/keyrings/"*".gpg" | sed "s|.gpg||g" | xargs | pacman-key --populate
+pacman-key --populate
 
 # Un comment the mirror list.
 #sed -i "s/#Server/Server/g" "/etc/pacman.d/mirrorlist"