Merge branch 'dev' into dev-stable

Author: Hayao0819

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,34 @@
+# This is a basic workflow to help you get started with Actions
+
+name: ShellCheck CL
+
+# Controls when the action will run. 
+on:
+  # Triggers the workflow on push or pull request events but only for the dev branch
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      # Runs a single command using the runners shell
+      - name: Run ShellCheck
+        uses: ludeeus/action-shellcheck@master
+        with:
+          severity: error
+        env:
+          SHELLCHECK_OPTS: --shell=bash

.github/workflows/codescan-analysis.yml

@@ -32,7 +32,7 @@ alteriso_version="3.1"
 # Load config file
 [[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1
 for config in "${defaultconfig}" "${script_path}/custom.conf"; do
-    [[ -f "${script_path}/${config}.conf" ]] && source "${script_path}/${config}.conf"
+    [[ -f "${config}" ]] && source "${config}"
 done
 
 umask 0022
@@ -424,7 +424,7 @@ prepare_build() {
     local module_check
     module_check(){
         msg_debug "Checking ${1} module ..."
-        ! bash "${tools_dir}/module.sh" check "${1}" && msg_error "Module ${1} is not available." "1";
+        bash "${tools_dir}/module.sh" check "${1}" || msg_error "Module ${1} is not available." "1";
     }
     modules=($(printf "%s\n" "${modules[@]}" | awk '!a[$0]++'))
     for_module "module_check {}"
@@ -600,10 +600,10 @@ make_pkgbuild() {
 # Customize installation (airootfs)
 make_customize_airootfs() {
     # Overwrite airootfs with customize_airootfs.
-    local _airootfs _airootfs_script_options _script _script_list _airootfs_list _main_script
+    local _airootfs _airootfs_script_options _script _script_list _airootfs_list=() _main_script
 
-    _airootfs_list=("${channel_dir}/airootfs.any" "${channel_dir}/airootfs.${arch}")
-    for_module '_airootfs_list=("${_airootfs_list[@]}" "${module_dir}/{}/airootfs.any" "${module_dir}/{}/airootfs.${arch}")'
+    for_module '_airootfs_list+=("${module_dir}/{}/airootfs.any" "${module_dir}/{}/airootfs.${arch}")'
+    _airootfs_list+=("${channel_dir}/airootfs.any" "${channel_dir}/airootfs.${arch}")
 
     for _airootfs in "${_airootfs_list[@]}";do
         if [[ -d "${_airootfs}" ]]; then

.github/workflows/shellcheck.yml

@@ -0,0 +1,2 @@
+[Seat:*]
+autologin-session=cinnamon2d

.travis.yml

@@ -0,0 +1,2 @@
+[Seat:*]
+autologin-session=i3

build.sh

@@ -22,7 +22,7 @@ declare -A menu_list=(
 
 function main() {
   local -r IFS=$'\n'
-  [[ $# -ne 0 ]] && eval "${menu_list[$1]}" || echo "${!menu_list[*]}"
+  [[ "${#}" -ne 0 ]] && eval "${menu_list[$1]}" || echo "${!menu_list[*]}"
 }
 
-main $@
+main "${@}"

channels/cinnamon/airootfs.any/etc/lightdm/lightdm.conf.d/02-autologin-session.conf

@@ -20,7 +20,7 @@ sed -i "s|%USERNAME%|${username}|g" "/etc/lightdm/lightdm.conf.d/02-autologin.co
 
 
 # Session list
-if cat "/etc/lightdm/lightdm.conf.d/02-autologin-session.conf" | grep "%SESSION%" 1> /dev/null 2>&1; then
+if [[ -f "/etc/lightdm/lightdm.conf.d/02-autologin-session.conf" ]] && cat "/etc/lightdm/lightdm.conf.d/02-autologin-session.conf" | grep "%SESSION%" 1> /dev/null 2>&1; then
     session_list=()
     while read -r session; do
         session_list+=("${session}")
@@ -32,6 +32,10 @@ if cat "/etc/lightdm/lightdm.conf.d/02-autologin-session.conf" | grep "%SESSION%
     elif (( "${#session_list[@]}" == 0)); then
         echo "Warining: Auto login session was not found"
     else
-        remove "/etc/lightdm/lightdm.conf.d/02-autologin-session.conf"
+        echo "Failed to set the session.Multiple sessions were found." >&2
+        echo "Please set the session of automatic login in /etc/lightdm/lightdm.conf.d/02-autologin-session.conf"
+        echo "Found session: $(printf "%s " "${session_list[@]}")"
+        sleep 0.5
+        exit 1
     fi
 fi

channels/i3/airootfs.any/etc/lightdm/lightdm.conf.d/02-autologin-session.conf

@@ -9,7 +9,7 @@
 set -e -u
 
 aur_username="aurbuild"
-pacman_debug=true
+pacman_debug=false
 pacman_args=()
 
 trap 'exit 1' 1 2 3 15