From patchwork Thu Sep 4 09:51:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi Shekar X-Patchwork-Id: 4325 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 04 Sep 2025 11:52:09 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5849q8Ox013292 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 4 Sep 2025 11:52:08 +0200 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-45b9c1b74d0sf4627115e9.3 for ; Thu, 04 Sep 2025 02:52:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1756979523; cv=pass; d=google.com; s=arc-20240605; b=HhhBOgSrV1Qt7MNcKnxIihs9V4sdcVKxEFVl+7bG9s78PNnhcS5o+JgO7PszZyGLlD XANU6eGd3DlXA3fCikOeSJavmx6lYMPwDu4AcVFLXjOnTtXmfNOYSd+VpbV4ww1xwyHH 5iS8LEV2olWj9OuivkZdHZrmT7luaWJq4sYfn1dYOj/3ksiYSJbSp35/tq61fa4FPFhf A1VN25dQZUCNVJOH4H7E0YzvJ1vwBLXLLRM78kVVRrAtf27SLwpivC8foWpZP0onbKGy ubTtsyQVpUtbKApnDcPGDXhkuBK0kIXwnao9u+WKXqMTtzC7Je+HBixJZLe1+wMwmkgP PyOA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xqfwScp4BI+eDNqAMYK2phmsIpdFoErrOJcSVCDTnCw=; fh=QDmrWXUdCF47uFYbt5iI3sKzHt0lIQAe6grwVg81SXY=; b=hPrPA3DgpCESZHVdiJJIj60h4zhiuLKz9vTO4m9hS72eTuEKJ2WpfSDyp/2usIo4QK jkKVOFkYe3aa5Q5tuynyfygD1XKzma9ClflVGjK0hoveavW151092vZyeF1nhbBnVx13 KSl09b3M/B087fMi3LFCo7601wLRZrOFnt3zd7MHC5B/36qmojvXOjpVg7O3+QPEHAYU V0VE2LI4Co/oOEO3fOOSWehaQu9PjKlIcdDaaw/L87XBD/7Hfq5muMz/I/P2JpJTf4w+ NnrUJEeHQrwaDqTeeUXkts4J5CEn7VWFeVdgl5heM92VlRmpeW330r+tttgwOoS5H5Mm P5Wg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Tjnismyk; spf=pass (google.com: domain of fm-1328757-20250904095159f0b53d46b800020709-w5mk1m@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1328757-20250904095159f0b53d46b800020709-w5MK1m@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1756979523; x=1757584323; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=xqfwScp4BI+eDNqAMYK2phmsIpdFoErrOJcSVCDTnCw=; b=RZ2FRlxlUEF7GAZRaGrnyC+TtDkuSYZkvDejqq/M/vyYS57/iTZjvHiO5JiAqF8lPK c6GPZgajbx4LyPZqgbRbeXFFTey3qR90cN5LDDwS7H3vKyMkAnjDo8kdDyehwgc395fX Rqt4PlPsGvRoRPNQHBpCdCu5Uj38gkoVq39p4Mk4KmBlToUxKl5xVDaLBR6qgfrsTaZS Dd2uCV/JIhqmlOHC4MYm5pcwypSR+8DIlAhiGo0Wtsrrgr8BjKmS0ccV8aVT/wDbvagg BfE90hPP46871sWp0BLS/7xIduM9Jx+8NN/BUGUwlT+XY7TCrIOkMeQ8IMzfJOOML/5L QLRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756979523; x=1757584323; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xqfwScp4BI+eDNqAMYK2phmsIpdFoErrOJcSVCDTnCw=; b=vwHIpvVYbHzZQ57juvCpOuDxmhD20DIfYWuXfy9HYJDL6IybqL8Ukto//Iomj0Tk1N ST3M/UuJQbRurlXNUMD6VpZQDwKeqBZhjej5OhRg46bpaE4VlZpdNHLgWF4ahEG20l+o tbUVSBKlqbymTXMoIHpyWfLcQShz48QeGsEJjPEgGkv3F4ZkYyqfEsfIOyeUXDxRfRJ3 Q1c59w89vEMjuaeZvr7rEKFSLZbxLoHGW64Xq4Hz2UhozGV1UqXlD4MxyFXFKAdFGQfF bhU3S6BZOqlT5uygJdY/jAV9Gl+YYxPIFz6AuHP0/hAuf8mGd+YwWQSnvMDRCqPP0MOD dFRA== X-Forwarded-Encrypted: i=2; AJvYcCVCclyPJazAtoeKxHNATjtytomJNVPoKGdLKQG5s6PYwXU2b3OF312x76kwwyB7F6FcFnmtTdk=@isar-build.org X-Gm-Message-State: AOJu0YzCgx4zMV+TBGFqzcX0FVc+z/Ml0CMAs/FbPGhLjW21PWh/wsZr m5ovjMXnJRfZ9GDH1BtqTAyyf03Y1JMiwOh4Q62E9qDP8VXMbw5+bhSw X-Google-Smtp-Source: AGHT+IGSalZyCGlOaoTbYmRyvlq6Y1ZCt6aBSyddUowMbGzDEyfjGG4+xGMBUAi2ZY7zpk1Os7J9cQ== X-Received: by 2002:a05:600c:1592:b0:45b:9a46:2655 with SMTP id 5b1f17b1804b1-45b9a4627b4mr46199915e9.13.1756979522956; Thu, 04 Sep 2025 02:52:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZeEABxzEqnX3xaOqCrjHcUZ5p1WC74VVhtSfrznEIchUw== Received: by 2002:a05:600c:3d92:b0:45b:6fba:90de with SMTP id 5b1f17b1804b1-45b78cb6128ls43616235e9.2.-pod-prod-08-eu; Thu, 04 Sep 2025 02:52:00 -0700 (PDT) X-Received: by 2002:a05:600c:1913:b0:45b:7e68:c6a3 with SMTP id 5b1f17b1804b1-45b877bdcbfmr188452335e9.16.1756979520456; Thu, 04 Sep 2025 02:52:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1756979520; cv=none; d=google.com; s=arc-20240605; b=W8QwjYXQbXJMTU/CN6jqIlRAyy8LHQXDcpX+Z8TRWKCQscg+Knf3pArOJter3yv3a8 WOxLf0Eh5LgoAqUIEDLK1xYsSa294yP0xK9QiEuXlHmLWY6PjzJqXRguKXVG9pMKt+im WMS/52qDEDXqMO+O2iESNgj70uPqq5WplbVejb1EJTsulTOJesyf9HYekP0HpVyLvmzp vJyN/RD6qf2Y9dg3zPscDNQH3xENQMjm8nHhYgWrZnnwW/q5k/asjVQoyKfannbvaD77 CgN39BBGHutUbwiLpg1lDrMjD4kYykZn8zA1AoKYEiNOj32nP7f5NjGKPUaGTmMqpfjq WjWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=C8hT0BnmFfk9ssiT8YY8aEtN5tr0dtc0oZTCn2VRw8k=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=AyzAG7CNVPDnCqNrG3VlADWoa1I2R8zbY09ARkwTGlKTVpdfnI1Hlmk8UWJ/pQ+XVl ZBttS2eXVAp0rP1J3wQBAUdQF2+qnfdEZuTztrm4iS7So7HlyBGTxzwLUXYuwCwIwsjx HYlw/kma7f4fMGxl0ELRBG5dRjDYwZ5Zb0EN0BobBQ8eRnbtLDw0yXd4oQ7+tx7aw8uX fQ99nv87gBdZ7X4OlXA6IJr5mfig+6jwTv54AZvr0pdzTx3REeEDOVGHG8uzY2bV5kuI gEDrgn33+GvAdu32lcTN6+N/7G8lZkQHFuNmdn9VyAI7ZTmFsKjAqtwGspJp8Dh67kVu r0Ow==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Tjnismyk; spf=pass (google.com: domain of fm-1328757-20250904095159f0b53d46b800020709-w5mk1m@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1328757-20250904095159f0b53d46b800020709-w5MK1m@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-45dd03a11f0si225075e9.1.2025.09.04.02.52.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Sep 2025 02:52:00 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-20250904095159f0b53d46b800020709-w5mk1m@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20250904095159f0b53d46b800020709 for ; Thu, 04 Sep 2025 11:51:59 +0200 X-Patchwork-Original-From: "'Kasturi Shekar' via isar-users" From: Kasturi Shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v5 2/2] deploy-image-wic.sh: fix shellcheck warnings Date: Thu, 4 Sep 2025 15:21:40 +0530 Message-Id: <20250904095140.103366-3-kasturi.shekar@siemens.com> In-Reply-To: <20250904095140.103366-1-kasturi.shekar@siemens.com> References: <20250904095140.103366-1-kasturi.shekar@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1328757:519-21489:flowmailer X-Original-Sender: kasturi.shekar@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Tjnismyk; spf=pass (google.com: domain of fm-1328757-20250904095159f0b53d46b800020709-w5mk1m@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1328757-20250904095159f0b53d46b800020709-w5MK1m@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Kasturi Shekar Reply-To: Kasturi Shekar Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= No functional changes, only style and readability fixes without altering runtime behavior Signed-off-by: Kasturi Shekar --- .../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..333762f1 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