From 27198d2b9134a31319b3478c1943f646b2e7d0f2 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 14:27:39 -0600
Subject: [PATCH 1/2] Reset _PIP_INSTALL_ARGS to empty for Alpine, similar to
 Ubuntu and Debian

---
 bootstrap-salt.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 123ebfcca..2191beb29 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5161,6 +5161,7 @@ install_cloud_linux_check_services() {
 #   Alpine Linux Install Functions
 #
 install_alpine_linux_stable_deps() {
+    _PIP_INSTALL_ARGS=""
     if ! grep -q '^[^#].\+alpine/.\+/community' /etc/apk/repositories; then
         # Add community repository entry based on the "main" repo URL
         __REPO=$(grep '^[^#].\+alpine/.\+/main\>' /etc/apk/repositories)
@@ -5179,6 +5180,7 @@ install_alpine_linux_stable_deps() {
 }
 
 install_alpine_linux_git_deps() {
+    _PIP_INSTALL_ARGS=""
     install_alpine_linux_stable_deps || return 1
 
     if ! __check_command_exists git; then
@@ -5194,6 +5196,7 @@ install_alpine_linux_git_deps() {
 
 install_alpine_linux_stable() {
     __PACKAGES="salt"
+    _PIP_INSTALL_ARGS=""
 
     if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ];then
         __PACKAGES="${__PACKAGES} salt-cloud"
@@ -5218,11 +5221,13 @@ install_alpine_linux_stable() {
 }
 
 install_alpine_linux_git() {
+    _PIP_INSTALL_ARGS=""
      __install_salt_from_repo "${_PY_EXE}" || return 1
     return 0
 }
 
 install_alpine_linux_post() {
+    _PIP_INSTALL_ARGS=""
     for fname in api master minion syndic; do
         # Skip if not meant to be installed
         [ $fname = "api" ] && \
@@ -5252,6 +5257,7 @@ install_alpine_linux_post() {
 }
 
 install_alpine_linux_restart_daemons() {
+    _PIP_INSTALL_ARGS=""
     [ "${_START_DAEMONS}" -eq $BS_FALSE ] && return
 
     for fname in api master minion syndic; do
@@ -5270,6 +5276,7 @@ install_alpine_linux_restart_daemons() {
 }
 
 install_alpine_linux_check_services() {
+    _PIP_INSTALL_ARGS=""
     for fname in api master minion syndic; do
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue
@@ -5286,6 +5293,7 @@ install_alpine_linux_check_services() {
 }
 
 daemons_running_alpine_linux() {
+    _PIP_INSTALL_ARGS=""
     [ "${_START_DAEMONS}" -eq $BS_FALSE ] && return
 
     FAILED_DAEMONS=0

From 09a36c52cad1e0d454f37446ca90ef78aef8e6fd Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 20 Sep 2024 14:47:57 -0600
Subject: [PATCH 2/2] Updated script date

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2191beb29..bd2cfc49e 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2024.07.23"
+__ScriptVersion="2024.09.20"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"