From c539ffa2b70b608ce7bcae50b792cada5473f940 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 27 May 2020 19:07:03 +0100
Subject: [PATCH] Fix Arch Linux installs

---
 bootstrap-salt.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d8fde95..bc4e109 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5515,11 +5515,19 @@ install_arch_linux_stable_deps() {
         pacman-db-upgrade || return 1
     fi
 
+    if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 2 ]; then
+        PY_PKG_VER=2
+    else
+        PY_PKG_VER=""
+    fi
+
     # YAML module is used for generating custom master/minion configs
-    pacman -Su --noconfirm --needed python2-yaml
+    # shellcheck disable=SC2086
+    pacman -Su --noconfirm --needed python${PY_PKG_VER}-yaml
 
     if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
-        pacman -Su --noconfirm --needed python2-apache-libcloud || return 1
+        # shellcheck disable=SC2086
+        pacman -Su --noconfirm --needed python${PY_PKG_VER}-apache-libcloud || return 1
     fi
 
     if [ "${_EXTRA_PACKAGES}" != "" ]; then