From c7705ab73e4cb46fece55acb499369475a06ac91 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Thu, 21 Nov 2024 13:56:18 -0700
Subject: [PATCH] Add quiet option for wget, and hand-tested Photon usage

---
 bootstrap-salt.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 16d91e6..897f1d5 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -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