From: "'Kasturi Shekar' via isar-users" <isar-users@googlegroups.com>
To: isar-users@googlegroups.com
Cc: Kasturi Shekar <kasturi.shekar@siemens.com>
Subject: [PATCH v4 2/2] deploy-image-wic.sh: fix shellcheck warnings
Date: Thu, 21 Aug 2025 12:09:43 +0530 [thread overview]
Message-ID: <20250821063944.47909-2-kasturi.shekar@siemens.com> (raw)
In-Reply-To: <20250821063944.47909-1-kasturi.shekar@siemens.com>
No functional changes, only style and readability fixes
without altering runtime behavior
Signed-off-by: Kasturi Shekar <kasturi.shekar@siemens.com>
---
.../deploy-image/files/usr/bin/deploy-image-wic.sh | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
index fa1061c1..e21da8e2 100755
--- a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
+++ b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh
@@ -8,8 +8,7 @@ installdata=${INSTALL_DATA:-/install}
SCRIPT_DIR=$( dirname -- "$( readlink -f -- "$0"; )"; )
-. ${SCRIPT_DIR}/../lib/deploy-image-wic/handle-config.sh
-
+. "${SCRIPT_DIR}/../lib/deploy-image-wic/handle-config.sh"
if ! $installer_unattended; then
installer_image_uri=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;)
@@ -37,7 +36,7 @@ if ! $installer_unattended; then
# inspired by poky/meta/recipes-core/initrdscripts/files/install-efi.sh
target_device_list=""
current_root_dev_type=$(findmnt / -o fstype -n)
- if [ ${current_root_dev_type} = "nfs" ]; then
+ if [ "$current_root_dev_type" = "nfs" ]; then
current_root_dev="nfs"
else
current_root_dev=$(readlink -f "$(findmnt / -o source -n)")
@@ -108,7 +107,7 @@ if ! $installer_unattended; then
exit 0
fi
else
- installer_target_dev=/dev/$(echo "$target_device_list" | tr -d " ")
+ installer_target_dev="/dev/$(echo "$target_device_list" | tr -d " ")"
fi
TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE "$installer_target_dev" | tr -d " ")
if ! dialog --yes-label Ok --no-label Cancel \
@@ -186,11 +185,13 @@ if version_ge "$bmap_version" "3.6"; then
gauge_pid=$!
fi
-if ! bmaptool ${quiet_flag} copy ${bmap_options} "$installer_image_uri" "${installer_target_dev}"; then
+if ! bmaptool "$quiet_flag" copy "$bmap_options" "$installer_image_uri" "$installer_target_dev"; then
kill "$gauge_pid"
exit 1
fi
+# Attempt to terminate the gauge process if still running.
+# Errors are ignored since the process may already have exited.
kill "$gauge_pid" 2>/dev/null
if ! $installer_unattended; then
--
2.39.5
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20250821063944.47909-2-kasturi.shekar%40siemens.com.
next prev parent reply other threads:[~2025-08-21 6:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <N7lI8iF-GEc>
2025-08-06 5:54 ` [PATCH v2] fix premature success dialog in installer script 'Kasturi Shekar' via isar-users
2025-08-06 7:29 ` 'MOESSBAUER, Felix' via isar-users
2025-08-06 9:28 ` 'Shekar, Kasturi' via isar-users
2025-08-06 10:22 ` 'Shekar, Kasturi' via isar-users
2025-08-20 9:34 ` [PATCH 1/2 v3] " 'Kasturi Shekar' via isar-users
2025-08-20 9:34 ` [PATCH 2/2] deploy-image-wic.sh: fix shellcheck warnings 'Kasturi Shekar' via isar-users
2025-08-20 15:49 ` [PATCH 1/2 v3] fix premature success dialog in installer script 'MOESSBAUER, Felix' via isar-users
2025-08-21 6:39 ` [PATCH v4 1/2] " 'Kasturi Shekar' via isar-users
2025-08-21 6:39 ` 'Kasturi Shekar' via isar-users [this message]
2025-08-21 6:39 ` [PATCH v4 0/2] fix premature success dialog 'Kasturi Shekar' via isar-users
2025-08-21 8:59 ` 'MOESSBAUER, Felix' via isar-users
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250821063944.47909-2-kasturi.shekar@siemens.com \
--to=isar-users@googlegroups.com \
--cc=kasturi.shekar@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox