From c3ebbe3e25abcdcbfc5ef520bc77f7a3e490c22a Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu@redhat.com>
Date: Mon, 8 Sep 2025 16:58:49 -0400
Subject: [PATCH 1/2] OCPBUGS-61373: Fix agent shellcheck issues

Disable shellcheck on agent-image.env The file is generated at
runtime after get-container-images.sh is executed.

Added missing double quotes and switch echo to printf in
install-status.sh
---
 .../agent/files/usr/local/bin/agent-extract-tui.sh  | 13 +++++++------
 .../agent/files/usr/local/bin/install-status.sh     |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/data/agent/files/usr/local/bin/agent-extract-tui.sh b/data/data/agent/files/usr/local/bin/agent-extract-tui.sh
index 15c7c04d1b..d78119da69 100644
--- a/data/data/agent/files/usr/local/bin/agent-extract-tui.sh
+++ b/data/data/agent/files/usr/local/bin/agent-extract-tui.sh
@@ -3,17 +3,18 @@
 set -xeuo pipefail
 
 /usr/local/bin/get-container-images.sh
+# shellcheck disable=SC1091
 source /usr/local/share/assisted-service/agent-images.env
 
 echo "Extracting agent-tui and libnmstate from agent-installer-utils image $AGENT_INSTALLER_UTILS_IMAGE"
 
-container_id=$(podman create $AGENT_INSTALLER_UTILS_IMAGE)
-mnt=$(podman mount $container_id)
+container_id=$(podman create "$AGENT_INSTALLER_UTILS_IMAGE")
+mnt=$(podman mount "$container_id")
 
-cp ${mnt}/usr/bin/agent-tui /usr/local/bin
-cp ${mnt}/usr/lib64/libnmstate.so.* /usr/local/lib
+cp "${mnt}/usr/bin/agent-tui" /usr/local/bin
+cp "${mnt}/usr/lib64/libnmstate.so.*" /usr/local/lib
 
-podman unmount $container_id
-podman rm $container_id
+podman unmount "$container_id"
+podman rm "$container_id"
 
 restorecon -FRv /usr/local/bin
diff --git a/data/data/agent/files/usr/local/bin/install-status.sh b/data/data/agent/files/usr/local/bin/install-status.sh
index a6da0fba0f..98df985869 100644
--- a/data/data/agent/files/usr/local/bin/install-status.sh
+++ b/data/data/agent/files/usr/local/bin/install-status.sh
@@ -54,7 +54,7 @@ check_host_config() {
 check_ui() {
     local ui_issue="90_ui-availability"
     if systemctl is-active --quiet "agent-start-ui"; then
-       echo "\\e{green}Please go to \\e{lightgreen}$AIUI_URL\\e{reset}\\e{green} in your browser to continue the installation\\e{reset}" | set_issue "${ui_issue}"
+       printf "\\e{green}Please go to \\e{lightgreen}%s\\e{reset}\\e{green} in your browser to continue the installation\\e{reset}" "${AIUI_URL}" | set_issue "${ui_issue}"
     else
        clear_issue "${ui_issue}"        
     fi

From 30c7416e98f38b7a9aee57fedcfd4e49099c503c Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu@redhat.com>
Date: Mon, 8 Sep 2025 17:28:54 -0400
Subject: [PATCH 2/2] OCPBUGS-61373: Fix shellcheck issues in bootstrap

---
 .../bootstrap/baremetal/files/usr/local/bin/build-metal3-env.sh | 2 +-
 .../files/usr/local/bin/bootstrap-verify-api-server-urls.sh     | 2 +-
 data/data/bootstrap/files/usr/local/bin/installer-gather.sh     | 2 +-
 .../bootstrap/files/usr/local/bin/installer-masters-gather.sh   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/data/bootstrap/baremetal/files/usr/local/bin/build-metal3-env.sh b/data/data/bootstrap/baremetal/files/usr/local/bin/build-metal3-env.sh
index 5b8bbb54a0..a630794f31 100644
--- a/data/data/bootstrap/baremetal/files/usr/local/bin/build-metal3-env.sh
+++ b/data/data/bootstrap/baremetal/files/usr/local/bin/build-metal3-env.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/bash
 
 set -euo pipefail
 
diff --git a/data/data/bootstrap/files/usr/local/bin/bootstrap-verify-api-server-urls.sh b/data/data/bootstrap/files/usr/local/bin/bootstrap-verify-api-server-urls.sh
index a0b8e8175e..74c1eaafa0 100644
--- a/data/data/bootstrap/files/usr/local/bin/bootstrap-verify-api-server-urls.sh
+++ b/data/data/bootstrap/files/usr/local/bin/bootstrap-verify-api-server-urls.sh
@@ -10,7 +10,7 @@ function lookup_url() {
     unset IPS
     unset IP
     IPS=$(dig "${2}" +short)
-    if [[ ! -z "${IPS}" ]] ; then
+    if [[ -n "${IPS}" ]] ; then
         echo "Successfully resolved ${1} ${2}"
         return 0
     else
diff --git a/data/data/bootstrap/files/usr/local/bin/installer-gather.sh b/data/data/bootstrap/files/usr/local/bin/installer-gather.sh
index 0eba2dfa32..4cc40fcbc8 100755
--- a/data/data/bootstrap/files/usr/local/bin/installer-gather.sh
+++ b/data/data/bootstrap/files/usr/local/bin/installer-gather.sh
@@ -6,7 +6,7 @@
 # Get target architecture
 arch=$(uname -m)
 
-if test "x${1}" = 'x--id'
+if test "${1}" = '--id'
 then
 	GATHER_ID="${2}"
 	shift 2
diff --git a/data/data/bootstrap/files/usr/local/bin/installer-masters-gather.sh b/data/data/bootstrap/files/usr/local/bin/installer-masters-gather.sh
index 45c446d71b..54221c6099 100755
--- a/data/data/bootstrap/files/usr/local/bin/installer-masters-gather.sh
+++ b/data/data/bootstrap/files/usr/local/bin/installer-masters-gather.sh
@@ -3,7 +3,7 @@
 # Get target architecture
 arch=$(uname -m)
 
-if test "x${1}" = 'x--id'
+if test "${1}" = '--id'
 then
 	GATHER_ID="${2}"
 	shift 2