From: hayao <shun819.mail@gmail.com>
Date: Sun, 27 Sep 2020 06:11:05 +0000 (+0900)
Subject: [update] : Supported defualtpassword
X-Git-Tag: rc3-alpha1~165^2~22
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de1e7ad087fb4c57bd620e684c6f904d65ddf068;p=alterlinux%2Falterlinux.git

[update] : Supported defualtpassword
---

diff --git a/allarch.sh b/allarch.sh
index 91cc0192..7b3de68d 100755
--- a/allarch.sh
+++ b/allarch.sh
@@ -19,6 +19,7 @@ script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
 defaultconfig="${script_path}/default.conf"
 all_arch=("x86_64" "i686")
 customized_username=false
+customized_password=false
 DEFAULT_ARGUMENT=""
 alteriso_version="3.0"
 
@@ -482,6 +483,11 @@ prepare_all_arch() {
         username="${defaultusername}"
     fi
 
+    # Set password
+    if [[ "${customized_password}" = false ]]; then
+        password="${defaultpassword}"
+    fi
+
     # Set architecture
     all_arch=($(cat "${script_path}/channels/${channel_name}/architecture" | grep -h -v ^'#'))
 
@@ -597,6 +603,7 @@ prepare_build() {
     check_bool nodepend
     check_bool shmkalteriso
     check_bool customized_username
+    check_bool customized_password
     check_bool noloopmod
     check_bool nochname
     check_bool tarball
@@ -1364,6 +1371,7 @@ while :; do
             shift 2
             ;;
         -p | --password)
+            customized_password=true
             password="${2}"
             shift 2
             ;;