Merge branch 'dev-stable'

Author: Hayao0819

build.sh

@@ -63,16 +63,14 @@ _usage () {
     echo "    -c <comp_type>     Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)"
     echo "                        Default: ${sfs_comp}"
     echo "    -g <gpg_key>       Set gpg key"
-    if [[ -z "${gpg_key}" ]]; then
-        echo "                        Default: empty"
-    else
-        echo "                        Default: ${gpg_key}"
-    fi
+    echo "                        Default: ${gpg_key}"
     echo "    -j                 Enable Japanese mode."
+    echo "                        Default: disable"
     echo "    -k <kernel>        Set special kernel type."
     echo "                       core means normal linux kernel"
     echo "                        Default: ${kernel}"
     echo "    -l                 Enable post-build cleaning."
+    echo "                        Default: disable"
     echo "    -o <out_dir>       Set the output directory"
     echo "                        Default: ${out_dir}"
     echo "    -p <password>      Set a live user password"
@@ -83,15 +81,34 @@ _usage () {
     echo "                        Default: ${username}"
     echo "    -w <work_dir>      Set the working directory"
     echo "                        Default: ${work_dir}"
-    echo "    -h                 This help message"
     echo "    -x                 Enable debug mode."
+    echo "                        Default: disable"
+    echo "    -h                 This help message and exit."
+    echo
+
+    for i in $(ls -l "${script_path}"/channels/ | awk '$1 ~ /d/ {print $9 }'); do
+        if [[ -n $(ls "${script_path}"/channels/${i}) ]] && [[ ! ${i} = "share" ]]; then
+            channel_list="${channel_list[@]} ${i}"
+        fi
+    done
+
+    echo "You can switch between installed packages, files included in images, etc. by channel."
     echo
-    echo " You can switch the packages to be installed on the channel."
     echo " Channel:"
-    echo "    arch               AlterLinux with a minimal GUI. "
-    echo "                       You can install a minimal CLI ArchLinux with Calamares."
-    echo "    xfce               Use Xfce4 for desktop environment."
-    echo "    plasma             Uses KDE and Qt software."
+
+    for _channel in ${channel_list[@]}; do
+        if [[ -f "${script_path}/channels/${_channel}/description.txt" ]]; then
+            description=$(cat "${script_path}/channels/${_channel}/description.txt")
+        else
+            description="This channel does not have a description.txt."
+        fi
+        echo -ne "    ${_channel}"
+        for i in $( seq 1 $(( 19 - ${#_channel} )) ); do
+            echo -ne " "
+        done
+        echo -ne "${description}\n"
+    done
+
 
     exit "${1}"
 }
@@ -102,7 +119,7 @@ check_bool() {
     local 
     case $(eval echo '$'${1}) in
         true | false) : ;;
-                   *) echo "The value ${boot_splash} set is invalid" >&2 ;;
+                   *) echo "The value ${boot_splash} set is invalid" >&2 ; exit 1;;
     esac
 }
 
@@ -118,6 +135,8 @@ run_once() {
     if [[ ! -e "${work_dir}/build.${1}" ]]; then
         "$1"
         touch "${work_dir}/build.${1}"
+    else
+        echo "Skipped because ${1} has already been executed."
     fi
 }
 
@@ -351,7 +370,6 @@ make_customize_airootfs() {
             -D "${install_dir}" \
             -r "/root/customize_airootfs.sh ${share_options}" \
             run
-
         if [[ -f "${work_dir}/x86_64/airootfs/root/customize_airootfs_${channel_name}.sh" ]]; then
             ${mkalteriso} ${mkalteriso_option} \
             -w "${work_dir}/x86_64" \
@@ -428,7 +446,6 @@ make_boot() {
     else
         cp "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz"
     fi
-
 }
 
 # Add other aditional/extra files to ${install_dir}/boot/
@@ -474,7 +491,11 @@ make_syslinux() {
             "${script_path}/syslinux/sys/archiso_sys-${kernel}.cfg" > "${work_dir}/iso/${install_dir}/boot/syslinux/archiso_sys.cfg"
     fi
 
-    cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux"
+    if [[ -f "${script_path}/channels/${channel_name}/splash.png" ]]; then
+        cp "${script_path}/channels/${channel_name}/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux"
+    else
+        cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux"
+    fi
     cp "${work_dir}"/x86_64/airootfs/usr/lib/syslinux/bios/*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux"
     cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux"
     cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux"
@@ -711,6 +732,14 @@ fi
 set -eu
 
 
+# If there is pacman.conf for each channel, use that for building
+[[ -f "${script_path}/channels/${channel_name}/pacman.conf" ]] && build_pacman_conf="${script_path}/channels/${channel_name}/pacman.conf"
+
+
+# If there is config for each channel. load that.
+[[ -f "${script_path}/channels/${channel_name}/config" ]] && source "${script_path}/channels/${channel_name}/config"
+
+
 # Create a working directory.
 [[ ! -d "${work_dir}" ]] && mkdir -p "${work_dir}"
 

channels/arch/description.txt

@@ -0,0 +1 @@
+AlterLinux with a minimal GUI.You can install a minimal CLI ArchLinux with Calamares."