Merge branch 'alter-lightdm' into dev

Author: Hayao0819

build.sh

@@ -591,8 +591,7 @@ make_packages_aur() {
 
     # prepare for yay
     cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh"
-
-    sed "s|https|http|g" "${build_dir}/pacman-${arch}.conf" > "${airootfs_dir}/etc/alteriso-pacman.conf"
+    sed "s|^CacheDir     =|#CacheDir    =|g" "${build_dir}/pacman-${arch}.conf" > "${airootfs_dir}/etc/alteriso-pacman.conf"
 
     # Run aur script
     _chroot_run "bash $([[ "${bash_debug}" = true ]] && echo -n "-x") /root/aur.sh ${_pkglist_aur[*]}"
@@ -614,7 +613,7 @@ make_pkgbuild() {
 
     #-- ビルドスクリプトの実行 --#
     cp -rf --preserve=mode "${script_path}/system/pkgbuild.sh" "${airootfs_dir}/root/pkgbuild.sh"
-    sed "s|https|http|g" "${build_dir}/pacman-${arch}.conf" > "${airootfs_dir}/etc/alteriso-pacman.conf"
+    sed "s|^CacheDir     =|#CacheDir    =|g" "${build_dir}/pacman-${arch}.conf" > "${airootfs_dir}/etc/alteriso-pacman.conf"
 
     # Run build script
     _chroot_run "bash $([[ "${bash_debug}" = true ]] && echo -n "-x") /root/pkgbuild.sh /pkgbuilds"
@@ -629,7 +628,7 @@ make_customize_airootfs() {
     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=("${module_dir}/{}/airootfs.any" "${module_dir}/{}/airootfs.${arch}" ${_airootfs_list[@]})'
+    for_module '_airootfs_list=("${_airootfs_list[@]}" "${module_dir}/{}/airootfs.any" "${module_dir}/{}/airootfs.${arch}")'
 
     for _airootfs in "${_airootfs_list[@]}";do
         if [[ -d "${_airootfs}" ]]; then

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

@@ -24,5 +24,6 @@ modules=(
     "share-extra"
     "zsh-powerline"
     "lightdm"
+    "alter-lightdm"
     "qtongtk"
 )

channels/cinnamon/config.any

@@ -24,5 +24,6 @@ modules=(
     "share-extra"
     "zsh-powerline"
     "lightdm"
+    "alter-lightdm"
     "qtongtk"
 )