From b6272a1b3462698ad89c00dbfdf3805e05493412 Mon Sep 17 00:00:00 2001 From: Bryce Larson Date: Mon, 11 Oct 2021 17:47:07 +0000 Subject: [PATCH] fix indentation, remove unnecessary IFS changes --- bootstrap-salt.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 24a7eeb..580115b 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4121,18 +4121,15 @@ __install_saltstack_rhel_repository() { # Instead, this should work correctly on all RHEL variants. base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/" if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then - gpg_key="SALTSTACK-GPG-KEY.pub,base/RPM-GPG-KEY-CentOS-7" + gpg_key="SALTSTACK-GPG-KEY.pub base/RPM-GPG-KEY-CentOS-7" else gpg_key="SALTSTACK-GPG-KEY.pub" fi - Field_Separator=$IFS - IFS=, gpg_key_urls="" for key in $gpg_key; do - gpg_key_urls=$(printf "${base_url}${key},%s" "$gpg_key_urls") + gpg_key_urls=$(printf "${base_url}${key},%s" "$gpg_key_urls") done - IFS=$Field_Separator repo_file="/etc/yum.repos.d/salt.repo" @@ -4149,12 +4146,9 @@ enabled_metadata=1 _eof fetch_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/" - Field_Separator=$IFS - IFS=, - for key in $gpg_key; do + for key in $gpg_key; do __rpm_import_gpg "${fetch_url}${key}" || return 1 done - IFS=$Field_Separator yum clean metadata || return 1 elif [ "$repo_rev" != "latest" ]; then