Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset _PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian #2019

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Reset _PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and Debian #2019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27198d2
Reset _PIP_INSTALL_ARGS to empty for Alpine, similar to Ubuntu and De…
dmurphy18 Sep 20, 2024
09a36c5
Updated script date
dmurphy18 Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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" ] && \
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading