saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add quiet option for wget, and hand-tested Photon usage

Browse source
This commit is contained in:
David Murphy 2024-11-21 13:56:18 -07:00
parent bcffbb3aff
commit c7705ab73e
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bootstrap-salt.sh
View file

@ -6227,7 +6227,7 @@ __get_packagesite_onedir_latest() {
cd ${generic_versions_tmpdir} || return 1
# leverage the windows directories since release Windows and Linux
wget -r -np -nH --exclude-directories=onedir,relenv,macos -x -l 1 "https://${_REPO_URL}/saltproject-generic/windows/"
wget -q -r -np -nH --exclude-directories=onedir,relenv,macos -x -l 1 "https://${_REPO_URL}/saltproject-generic/windows/"
if [ "$#" -gt 0 ] && [ -n "$1" ]; then
MAJOR_VER="$1"
# shellcheck disable=SC2010
@ -6564,9 +6564,6 @@ install_photon_onedir_deps() {
install_photon_onedir() {
# DGM debug
set -v
set -x
echodebug "install_photon_onedir() entry"
@ -6576,14 +6573,14 @@ install_photon_onedir() {
if [ "$(echo "$STABLE_REV" | grep -E '^(3006|3007)$')" != "" ]; then
# Major version Salt, config and repo already setup
__get_packagesite_onedir_latest "$STABLE_REV"
MINOR_VER_STRG="$_GENERIC_PKG_VERSION"
MINOR_VER_STRG="-$_GENERIC_PKG_VERSION"
elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
# Minor version Salt, need to add specific minor version
MINOR_VER_STRG="-$STABLE_REV"
else
# default to latest version Salt, config and repo already setup
__get_packagesite_onedir_latest
MINOR_VER_STRG="$_GENERIC_PKG_VERSION"
MINOR_VER_STRG="-$_GENERIC_PKG_VERSION"
fi
__PACKAGES=""
@ -7529,7 +7526,7 @@ __macosx_get_packagesite_onedir_latest() {
macos_versions_tmpdir=$(mktemp -d)
curr_pwd=$(pwd)
cd ${macos_versions_tmpdir} || return 1
wget -r -np -nH --exclude-directories=onedir,relenv,windows -x -l 1 "$SALT_MACOS_PKGDIR_URL/"
wget -q -r -np -nH --exclude-directories=onedir,relenv,windows -x -l 1 "$SALT_MACOS_PKGDIR_URL/"
if [ "$#" -gt 0 ] && [ -n "$1" ]; then
MAJOR_VER="$1"
# shellcheck disable=SC2010