[add] : i686 packages

[alterlinux/alterlinux.git] / keyring.sh

diff --git a/keyring.sh b/keyring.sh
index 1e06da9..f1a75f0 100755 (executable)
--- a/keyring.sh
+++ b/keyring.sh
@@ -2,7 +2,7 @@
 #
 # Yamada Hayao
 # Twitter: @Hayao0819
-# Email  : hayao@fascone.net
+# Email  : hayao@fascode.net
 #
 # (c) 2019-2020 Fascode Network.
 #
@@ -76,7 +76,7 @@ echo_color() {
 
     shift $((OPTIND - 1))
 
-    echo ${echo_opts} "\e[$([[ -v backcolor ]] && echo -n "${backcolor}"; [[ -v textcolor ]] && echo -n ";${textcolor}"; [[ -v decotypes ]] && echo -n ";${decotypes}")m${@}\e[m"
+    echo ${echo_opts} "\e[$([[ -v backcolor ]] && echo -n "${backcolor}"; [[ -v textcolor ]] && echo -n ";${textcolor}"; [[ -v decotypes ]] && echo -n ";${decotypes}")m${*}\e[m"
     OPTIND=${OPTIND_bak}
 }
 
@@ -148,17 +148,8 @@ checkpkg() {
 }
 
 
-_pacman_install() {
-    for i in ${@}; do
-        if [[ $(checkpkg "${i}") = false ]]; then
-            pacman -S --noconfirm "${i}"
-        fi
-    done
-}
-
-
 run() {
-    msg_info "Running ${@}"
+    msg_info "Running ${*}"
     ${@}
 }
 
@@ -185,10 +176,12 @@ prepare() {
 
 
 update_arch_key() {
+    pacman-key --refresh-keys
+    pacman-key --init
+    pacman-key --populate archlinux
+    pacman -S --noconfirm  core/archlinux-keyring
     pacman-key --init
     pacman-key --populate archlinux
-    _pacman_install core/archlinux-keyring
-    pacman-key --refresh-keys
     pacman -Sy
 }
 
@@ -217,9 +210,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