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

Add support for the -R flag on macOS. #1871

Merged
merged 3 commits into from
Dec 7, 2022
Merged

Add support for the -R flag on macOS. #1871

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad4cb2d
Add support for the -R flag on macOS.
pjcreath Sep 20, 2022
835289c
Merge branch 'develop' into develop
garethgreenaway Sep 30, 2022
564ea55
Merge branch 'develop' into develop
garethgreenaway Dec 7, 2022
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
4 changes: 2 additions & 2 deletions bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ __usage() {
points to a repository that mirrors Salt packages located at
repo.saltproject.io. The option passed with -R replaces the
"repo.saltproject.io". If -R is passed, -r is also set. Currently only
works on CentOS/RHEL and Debian based distributions.
works on CentOS/RHEL and Debian based distributions and macOS.
-s Sleep time used when waiting for daemons to start, restart and when
checking for the services running. Default: ${__DEFAULT_SLEEP}
-S Also install salt-syndic
Expand Down Expand Up @@ -8230,7 +8230,7 @@ __macosx_get_packagesite() {
fi

PKG="salt-${STABLE_REV}-${__PY_VERSION_REPO}-${DARWIN_ARCH}.pkg"
SALTPKGCONFURL="https://repo.saltproject.io/osx/${PKG}"
SALTPKGCONFURL="https://${_REPO_URL}/osx/${PKG}"
}

# Using a separate conf step to head for idempotent install...
Expand Down