From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Fri, 19 Aug 2022 17:13:56 +0000 (+0000)
Subject: Merge "Chore: Fix bashate warnings"
X-Git-Tag: v0.79.4~4
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=9fb1e597159ab0b87e951e983edb6d08ccd61275;hp=429412ef9cac443f6dcca6572111d853de067bc1;p=releng%2Fglobal-jjb.git

Merge "Chore: Fix bashate warnings"
---

diff --git a/jenkins-init-scripts/disable-firewall.sh b/jenkins-init-scripts/disable-firewall.sh
index 79e1d3a8..b3efb22d 100755
--- a/jenkins-init-scripts/disable-firewall.sh
+++ b/jenkins-init-scripts/disable-firewall.sh
@@ -16,7 +16,8 @@ case "$OS" in
         systemctl stop firewalld
     ;;
     CentOS|RedHat)
-        if [ "$(facter operatingsystemrelease | cut -d '.' -f1)" -lt "7" ]; then
+        os_release_ver = "$(facter operatingsystemrelease | cut -d '.' -f1)"
+        if [ "${os_release_ver}" -lt "7" ]; then
             service iptables stop
         else
             systemctl stop firewalld
diff --git a/jjb-compare-xml.sh b/jjb-compare-xml.sh
index ee65d3a6..98ad4194 100755
--- a/jjb-compare-xml.sh
+++ b/jjb-compare-xml.sh
@@ -25,7 +25,8 @@ gittmp="$(mktemp -d)"
 git worktree add --detach "$gittmp" origin/master
 pushd "$gittmp" || exit
 echo "Generating expected XML."
-jenkins-jobs test --recursive -o "$expected_xml_dir" "$gittmp":.jjb-test > /dev/null 2>&1
+jenkins-jobs test --recursive -o "$expected_xml_dir" \
+    "$gittmp":.jjb-test > /dev/null 2>&1
 popd || exit
 rm -r "$gittmp"
 
@@ -56,6 +57,7 @@ echo "No double curly braces found."
 rm -rf "$test_dir" "$expected_xml_dir"
 
 if $fail; then
-    echo "WARN: Differences detected. Check above for jobs that have been changed."
+    echo "WARN: Differences detected." \
+        "Check above for jobs that have been changed."
     exit 0
 fi