From bd93effa0777783a259f3e0bbe96b7dcb6d15fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 21 Apr 2026 22:11:36 +0200 Subject: [PATCH] tools: Fix shellcheck issues in rootfs_lib.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Address shellcheck warnings including proper variable quoting, use of [[ ]] over [ ], declaring and assigning variables separately, and adding appropriate shellcheck disable directives where needed. Signed-off-by: Fabiano Fidêncio Made-with: Cursor --- tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh index f96142d7eb..eff847cc8d 100644 --- a/tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh +++ b/tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh @@ -9,7 +9,7 @@ build_rootfs() # Mandatory local ROOTFS_DIR="$1" - [ -z "$ROOTFS_DIR" ] && die "need rootfs" + [[ -z "${ROOTFS_DIR}" ]] && die "need rootfs" # In case of support EXTRA packages, use it to allow # users add more packages to the base rootfs @@ -19,10 +19,12 @@ build_rootfs() mkdir -p "${ROOTFS_DIR}" PKG_MANAGER="tdnf" + # shellcheck disable=SC2154 DNF="${PKG_MANAGER} -y --installroot=${ROOTFS_DIR} --noplugins --releasever=${OS_VERSION}" info "install packages for rootfs" - $DNF install ${EXTRA_PKGS} ${PACKAGES} + # shellcheck disable=SC2154,SC2086 + ${DNF} install ${EXTRA_PKGS} ${PACKAGES} - rm -rf ${ROOTFS_DIR}/usr/share/{bash-completion,cracklib,doc,info,locale,man,misc,pixmaps,terminfo,zoneinfo,zsh} + rm -rf "${ROOTFS_DIR}"/usr/share/{bash-completion,cracklib,doc,info,locale,man,misc,pixmaps,terminfo,zoneinfo,zsh} }