Merge branch 'dev' into dev-stable

Author: Hayao0819

channels/lxde/airootfs.i686/etc/lightdm/lightdm.conf

@@ -120,7 +120,7 @@ session-wrapper=/etc/lightdm/Xsession
 autologin-user=%USERNAME%
 autologin-user-timeout=0
 #autologin-in-background=false
-autologin-session=lxde
+autologin-session=LXDE
 #exit-on-failure=false
 
 #

channels/lxde/airootfs.x86_64/etc/lightdm/lightdm.conf

@@ -120,7 +120,7 @@ session-wrapper=/etc/lightdm/Xsession
 autologin-user=%USERNAME%
 autologin-user-timeout=0
 #autologin-in-background=false
-autologin-session=lxde
+autologin-session=LXDE
 #exit-on-failure=false
 
 #

keyring.sh

@@ -148,15 +148,6 @@ checkpkg() {
 }
 
 
-_pacman_install() {
-    for i in ${@}; do
-        if [[ $(checkpkg "${i}") = false ]]; then
-            pacman -S --noconfirm "${i}"
-        fi
-    done
-}
-
-
 run() {
     msg_info "Running ${@}"
     ${@}
@@ -185,10 +176,10 @@ prepare() {
 
 
 update_arch_key() {
+    pacman-key --refresh-keys
     pacman-key --init
     pacman-key --populate archlinux
-    _pacman_install core/archlinux-keyring
-    pacman-key --refresh-keys
+    pacman -S --noconfirm  core/archlinux-keyring
     pacman -Sy
 }
 
@@ -217,9 +208,8 @@ remove_alter_key() {
 }
 
 update_arch32_key() {
-    pacman -Syy --config "${alter_pacman_conf_i686}"
-    pacman -Sw --noconfirm --config "${alter_pacman_conf_i686}" archlinux32-keyring
-    pacman -U --noconfirm $(ls /var/cache/pacman/pkg/* | grep archlinux32-keyring | tail -n 1)
+    pacman -Sy --config "${alter_pacman_conf_i686}"
+    pacman --noconfirm -S --config "${alter_pacman_conf_i686}" alter-stable/archlinux32-keyring
     pacman-key --init
     pacman-key --populate archlinux32
     #pacman-key --refresh-keys