From 724d06eec5845fe2adb4d61ed6858fb305dd74a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity@gmail.com>
Date: Fri, 30 Oct 2015 17:11:55 +0200
Subject: [PATCH] bootstrap: use a proper dependency test for Arch

`pacman -T` exists for this exact purpose; it respects provides without
having to manually code them into the script.
---
 bootstrap/_arch_common.sh | 42 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/bootstrap/_arch_common.sh b/bootstrap/_arch_common.sh
index 6895addf4..f66067ffb 100755
--- a/bootstrap/_arch_common.sh
+++ b/bootstrap/_arch_common.sh
@@ -1,29 +1,27 @@
 #!/bin/sh
 
 # Tested with:
-#   - Manjaro 15.09 (x86_64)
 #   - ArchLinux (x86_64)
-
-# Both "gcc-multilib" and "gcc" packages provide gcc. If user already has
-# "gcc-multilib" installed, let's stick to their choice
-if pacman -Qc gcc-multilib &>/dev/null
-then
-	GCC_PACKAGE="gcc-multilib";
-else
-	GCC_PACKAGE="gcc";
-fi
-
+#
 # "python-virtualenv" is Python3, but "python2-virtualenv" provides
 # only "virtualenv2" binary, not "virtualenv" necessary in
 # ./bootstrap/dev/_common_venv.sh
-pacman -S --needed \
-  git \
-  python2 \
-  python-virtualenv \
-  "$GCC_PACKAGE" \
-  dialog \
-  augeas \
-  openssl \
-  libffi \
-  ca-certificates \
-  pkg-config \
+
+deps="
+  git
+  python2
+  python-virtualenv
+  gcc
+  dialog
+  augeas
+  openssl
+  libffi
+  ca-certificates
+  pkg-config
+"
+
+missing=$(pacman -T $deps)
+
+if [ "$missing" ]; then
+  pacman -S --needed $missing
+fi