mirror of
https://github.com/openshift/installer.git
synced 2026-02-05 15:47:14 +01:00
Merge pull request #9938 from barbacbd/shellcheck-fix-4.20
OCPBUGS-61552: Shellcheck fix 4.20
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user