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

Adjust Photon git install, and corrected check for break-system-packages using pip3

Browse source
This commit is contained in:
David Murphy 2024-07-03 15:23:26 -06:00 • committed by Daniel Wozniak
parent 69d2645f70
commit fdd6b3240b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrap-salt.sh
View file

@ -2774,10 +2774,10 @@ EOM
fi
_USE_BREAK_SYSTEM_PACKAGES=""
_PIP_VERSION=$(${_pip_cmd} --version | awk '{print $2}')
_PIP_MAJOR_VERSION=$(${_pip_cmd} --version | awk '{print $2}' | awk -F '.' '{print $1}')
# shellcheck disable=SC2086,SC2090
if [ ${_PIP_VERSION} -ge 24 ]; then
if [ ${_PIP_MAJOR_VERSION} -ge 24 ]; then
_USE_BREAK_SYSTEM_PACKAGES="--break-system-packages"
echodebug "pip command is greater than / equal 24, using ${_USE_BREAK_SYSTEM_PACKAGES}"
fi
@ -6628,7 +6628,7 @@ install_photon_git() {
set -x
echodebug "install_photon_git() entry"
install_photon_git_deps || return 1
## DGM install_photon_git_deps || return 1
if [ "${_PY_EXE}" != "" ]; then
_PYEXE=${_PY_EXE}