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

Removed unused variable

Browse source
This commit is contained in:
David Murphy 2024-12-04 09:51:13 -07:00
parent e4b43b099b
commit 1b98100152
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
bootstrap-salt.sh
View file

@ -26,7 +26,7 @@
#====================================================================================================================== #======================================================================================================================
set -o nounset # Treat unset variables as an error set -o nounset # Treat unset variables as an error
__ScriptVersion="2024.11.29" __ScriptVersion="2024.12.03"
__ScriptName="bootstrap-salt.sh" __ScriptName="bootstrap-salt.sh"
__ScriptFullName="$0" __ScriptFullName="$0"
@ -6634,36 +6634,39 @@ __ZYPPER_REQUIRES_REPLACE_FILES=-1
__set_suse_pkg_repo() { __set_suse_pkg_repo() {
# Set distro repo variable ## DGM # Set distro repo variable
if [ "${DISTRO_MAJOR_VERSION}" -gt 2015 ]; then ## DGM if [ "${DISTRO_MAJOR_VERSION}" -gt 2015 ]; then
DISTRO_REPO="openSUSE_Tumbleweed" ## DGM DISTRO_REPO="openSUSE_Tumbleweed"
elif [ "${DISTRO_MAJOR_VERSION}" -eq 15 ] && [ "${DISTRO_MINOR_VERSION}" -ge 4 ]; then ## DGM elif [ "${DISTRO_MAJOR_VERSION}" -eq 15 ] && [ "${DISTRO_MINOR_VERSION}" -ge 4 ]; then
DISTRO_REPO="${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}" ## DGM DISTRO_REPO="${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}"
elif [ "${DISTRO_MAJOR_VERSION}" -ge 42 ] || [ "${DISTRO_MAJOR_VERSION}" -eq 15 ]; then ## DGM elif [ "${DISTRO_MAJOR_VERSION}" -ge 42 ] || [ "${DISTRO_MAJOR_VERSION}" -eq 15 ]; then
DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}" ## DGM DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}"
else ## DGM else
DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}" ## DGM DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}"
fi ## DGM fi
suse_pkg_url_base="https://download.opensuse.org/repositories/systemsmanagement:/saltstack" ## DGM suse_pkg_url_base="https://download.opensuse.org/repositories/systemsmanagement:/saltstack"
suse_pkg_url_path="${DISTRO_REPO}/systemsmanagement:saltstack.repo" ## DGM suse_pkg_url_path="${DISTRO_REPO}/systemsmanagement:saltstack.repo"
SUSE_PKG_URL="$suse_pkg_url_base/$suse_pkg_url_path" ## DGM SUSE_PKG_URL="$suse_pkg_url_base/$suse_pkg_url_path"
SUSE_PKG_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
} }
__check_and_refresh_suse_pkg_repo() { __check_and_refresh_suse_pkg_repo() {
# Check to see if systemsmanagement_saltstack exists # Check to see if systemsmanagement_saltstack exists
__zypper repos | grep -q systemsmanagement_saltstack ## DGM __zypper repos | grep -q systemsmanagement_saltstack
__zypper repos | grep -q 'salt.repo'
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
# zypper does not yet know anything about systemsmanagement_saltstack ## DGM # zypper does not yet know anything about systemsmanagement_saltstack
# zypper does not yet know anything about salt.repo
__zypper addrepo --refresh "${SUSE_PKG_URL}" || return 1 __zypper addrepo --refresh "${SUSE_PKG_URL}" || return 1
fi fi
} }
__version_lte() { __version_lte() {
if ! __check_command_exists python; then if ! __check_command_exists python3; then
zypper --non-interactive install --replacefiles --auto-agree-with-licenses python || \ zypper --non-interactive install --replacefiles --auto-agree-with-licenses python3 || \
zypper --non-interactive install --auto-agree-with-licenses python || return 1 zypper --non-interactive install --auto-agree-with-licenses python3 || return 1
fi fi
if [ "$(${_PY_EXE} -c 'import sys; V1=tuple([int(i) for i in sys.argv[1].split(".")]); V2=tuple([int(i) for i in sys.argv[2].split(".")]); print(V1<=V2)' "$1" "$2")" = "True" ]; then if [ "$(${_PY_EXE} -c 'import sys; V1=tuple([int(i) for i in sys.argv[1].split(".")]); V2=tuple([int(i) for i in sys.argv[2].split(".")]); print(V1<=V2)' "$1" "$2")" = "True" ]; then