From 281e21cc9c13f690befae7ed45b819d9707cf89b Mon Sep 17 00:00:00 2001
From: hayao <shun819.mail@gmail.com>
Date: Thu, 16 Apr 2020 12:21:23 +0900
Subject: [PATCH] [update] : Speed up dependency checking.

---
 wizard.sh | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/wizard.sh b/wizard.sh
index 3410e6a1..0e4a38ab 100755
--- a/wizard.sh
+++ b/wizard.sh
@@ -37,24 +37,34 @@ function install_dependencies () {
     local checkpkg
     local dependence
     local pkg
+    local installed_pkg
+    local installed_ver
+    local check_pkg
 
-    function checkpkg () {
-        if [[ $(pacman -Q "${1}" 2> /dev/null | awk '{print $1}') = "${1}" ]]; then
-            if [[ $(pacman -Q "${1}" 2> /dev/null | awk '{print $2}') = $(pacman -Sp --print-format '%v' "${1}") ]]; then
-                echo -n "true"
-            else
-                echo -n "false"
+    dependence=("git" "make" "arch-install-scripts" "squashfs-tools" "libisoburn" "dosfstools" "lynx" "archiso" "bash" "base")
+    installed_pkg=($(pacman -Q | awk '{print $1}'))
+    installed_ver=($(pacman -Q | awk '{print $2}'))
+
+    check_pkg() {
+        local i
+        for i in $(seq 1 ${#installed_pkg[@]}); do
+            if [[ ${installed_pkg[${i}]} = ${1} ]]; then
+                if [[ ${installed_ver[${i}]} = $(pacman -Sp --print-format '%v' ${1}) ]]; then
+                    echo -n "true"
+                    return 0
+                else
+                    echo -n "false"
+                    return 0
+                fi
             fi
-        else
-            echo -n "false"
-        fi
+        done
+        echo -n "false"
+        return 0
     }
 
-    dependence=("git" "make" "arch-install-scripts" "squashfs-tools" "libisoburn" "dosfstools" "lynx" "archiso" "bash" "base")
-
     echo "依存関係を確認しています..."
     for pkg in ${dependence[@]}; do
-        if [[ $(checkpkg ${pkg}) = false ]]; then
+        if [[ $(check_pkg ${pkg}) = false ]]; then
             install=(${install[@]} ${pkg})
         fi
     done
-- 
2.11.0