Skip to content

Commit

Permalink
Add quiet option for wget, and hand-tested Photon usage
Browse files Browse the repository at this point in the history
  • Loading branch information
dmurphy18 committed Nov 21, 2024
1 parent bcffbb3 commit c7705ab
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions bootstrap-salt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -6564,9 +6564,6 @@ install_photon_onedir_deps() {


install_photon_onedir() {
# DGM debug
set -v
set -x

echodebug "install_photon_onedir() entry"

Expand All @@ -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=""
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit c7705ab

Please sign in to comment.