From patchwork Wed Aug 20 09:34:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi Shekar X-Patchwork-Id: 4296 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 20 Aug 2025 11:34:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f56.google.com (mail-oa1-f56.google.com [209.85.160.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 57K9Ylw8028615 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Aug 2025 11:34:48 +0200 Received: by mail-oa1-f56.google.com with SMTP id 586e51a60fabf-30cce5d0a34sf12788643fac.0 for ; Wed, 20 Aug 2025 02:34:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755682481; cv=pass; d=google.com; s=arc-20240605; b=JUOlPKfyqj/Z10g1pVkoPDxSfSLUvxtvoqRNdDLmN7K6szN2VP7ccSC2jeQrjLiIo/ ESj+vAoKqB0ORnnpR3aEqEq77I5wDQB56kVPpJS0UAu/yHYYc8YdrSavMPjD0iabP8wo em/rU6lfaguF52yJcK4E8KLxuH224tfvzuC9+79zRbt5YgQwWwrVdSGUPXCOkeoz5oUE cda9cPGLyi8CTIbjpujBb972St5Ha029pY9S0XFTTAEdDM7EI7zKBcB5rdruaFZf2DCn WhohC1fOvguapSaYMYbU9YsW5OOu8VfzNqkVm8Pg/TrEHFFJWNE214AT/TWghhMgj0aB W2Yw== 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=w502OVV0A0JuE+YAG8Y7/be5bi3n3GdVPdeQW0m58zY=; fh=bURtnDRill9nKz+zu2iTVFQ9K5AEXoscRdFq15uTMLQ=; b=GStMt+LjdgZnmXXMVqRmti4BuNz1Cvj75iqiiOhHpIrcM96yE9Lr39DZxaCenOyt+v B3pkDVZMgTmbmOIOmC8oM5bXNCn8qjFFV6v/rb5mWL3s8BCSb3gpHMZjfVZDvFf+j7Qj g0UlBjbx7OaqVNt3kaK8ENLEFZH0q18tpl8775K9OzSlq/KjMRAS6uL3g0pNsE5naTB0 Tweddw30dXHDd3qJFxCjuAOzpbou0d4zvg9xad3b0Tn44aTKtZKkolYUGGJdlK5zHRdJ 6oYZKuE9VjF93NRGeXGPCsqR5xed7tTVZcqv++KUvS9D3am4MVW/+4nRgzzEAoZZhPh6 FztA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=OY3uiOP7; spf=pass (google.com: domain of fm-1328757-2025082009343873c4dcd8407e92265d-7t0f8t@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328757-2025082009343873c4dcd8407e92265d-7T0F8t@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=1755682481; x=1756287281; 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=w502OVV0A0JuE+YAG8Y7/be5bi3n3GdVPdeQW0m58zY=; b=Pt2RJay9tdDdJhie32b1sIlOM22uptWdMrTVPvpW+1gmhL7ehzcBLhc4VneG0wAWO+ JRBP+LORb6MR8jie9Hx/imLBAPMj7cjQF56Jlwy+G19yJ2l2GW9DMEFL+kjXA76kWuOC lGVLFSfx2x9MvO7LfSsuPswmYheY3uNX8ZyGs2mwHKQ3LCK+TKHXXPUk5nD8vxpd2/PM suMf96AKamXjl1HlUf47oEaZA8lKHVd0H2hF1dE3QCweb2ztPiL1Gf9dO3Z7xdBufX9w /INaPQzewsB4Ti4K26m/ixoOHIeno22/x1aFse10jDEieRvtCgfCSNM4S59KqNN9sBpR gUDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755682481; x=1756287281; 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=w502OVV0A0JuE+YAG8Y7/be5bi3n3GdVPdeQW0m58zY=; b=OeefQdAJJ1xgrkAxl58JNmejceC9SsdNjf9P4P8qLj10nAJsRBBtlKeegFHzVMseEp +0yeuDg2k4nuVHR7LC5A43mQhYpM9SQmdJWM0rRvvFTOM6gy9c88u3M73jmvN/fMLeAr Nm/1XdO5viZzxallrTfDYx7Dni7WVBWjAcE5hLjnXIRK2XKmVHRvtw9I5PfHKRgg5Qwu nS48cXeOWwuBpu0SSh722NPyios+p7avBrLRctFstbVc25wiRga4D2KaNlLK3N70B+RU C/BUaqIUJckfF3bo3O51uy/dJvgVJXr15QSjl4AvtsqKbQL88LnlB0Ww+vh+EHaP9T5t Fo2w== X-Forwarded-Encrypted: i=2; AJvYcCWUfv/Cn53hPgjBSXEZWVibHAuzqc1U0MDJuVw5FV3KRSkbfMtLDPNLvBClJs1cWwm1mdPKu24=@isar-build.org X-Gm-Message-State: AOJu0Yx9IF3npfxVA6H8AuNG9EXW1JImxaC8r+Xh7mECgqgutkgH00Fx m68CNWfQXZyrtFnX08Lmn6K8iPn+bmtfEyGc2eWmKYFzWsfCdaLIFOxf X-Google-Smtp-Source: AGHT+IH5F0xc3Cxc/g5a5HE2Y6hXiIAZmYyDcZ1h1kPbhbe8AAgKPAemv5gFCnX8agVhAS8KzEERbw== X-Received: by 2002:a05:6871:8905:b0:300:d9f4:dfaa with SMTP id 586e51a60fabf-311229b1f63mr1357423fac.27.1755682481535; Wed, 20 Aug 2025 02:34:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZc8XR6mhRZcKIDklwtAfr6ahM180pBFSOoEIwM7mfRvyA== Received: by 2002:a05:6870:170f:b0:30b:af41:d3a3 with SMTP id 586e51a60fabf-30cceb49217ls2820473fac.1.-pod-prod-09-us; Wed, 20 Aug 2025 02:34:40 -0700 (PDT) X-Received: by 2002:a05:6870:611e:b0:314:9684:fe18 with SMTP id 586e51a60fabf-314968510b8mr294795fac.51.1755682480645; Wed, 20 Aug 2025 02:34:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755682480; cv=none; d=google.com; s=arc-20240605; b=EUj2wE0BtXSiGuIvG6WluKjpCiFNVq+mlCxfPuhBqccz/Yc82QuW0gP+9eCtX31G5l QFWUIvVklASLCLApE0fqJVlZoZog/dIjoVHS37jqTo3BDMQCKtdb8+iVEmbLVcZi1fgT 43m1fhnBaYWcsxJIu+vri9nbbU7Lwo6DtC3rZhOS32D5oSIuizGwidbAB2IS3SiLuwE/ 8mkF7svlloHWIqN9V1Yf+PbiLHbWSxDr4uyekZcmXaJt906aaVTj0VGLoHAPJi8tWtou gQMIvufHgl1+SJ/6EypY+XwEmoByEICzyMWkW8wnHLZhSHL9FvcSGCLY07cAWT/EGP3X m0gg== 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=OllHgaJPHZrcy9CF5DlL8MbEUxZTRUPFW1t+DfBaZ/4=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=ggG5X4BW+YI2sncrJ53XMrWYQn8Z8yx5+DWN9OM2Ow6mxbB7i1ZBuJN5cv8CtAB605 z/3s4KUa1uAkFcyDyxPGLNN5q3IR/6RzP6lCa9g2kBxoXkmry5QT13xm7QrKrYXIvA85 9G/eUSbBp61+kbe6zhbVtBiq+m7qGfO4Qd4cHIXRnWo4bHZKEK+nFKVbLWyj7nRphvIk NHQYUC4Fjs1TWydOyNEzxj8lobBFGF1jZ9nm5tTAqlW+DWZmTfEKuk1ieI72ifu/H3Do kOxvA7b23o5rsMZeMOgX/1IeEiw24exslAdHkDx08FmO0Sc0QJSa75GYpkQ62w5rwn/E DOfQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=OY3uiOP7; spf=pass (google.com: domain of fm-1328757-2025082009343873c4dcd8407e92265d-7t0f8t@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328757-2025082009343873c4dcd8407e92265d-7T0F8t@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 586e51a60fabf-310ab57b3fbsi631590fac.0.2025.08.20.02.34.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Aug 2025 02:34:40 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-2025082009343873c4dcd8407e92265d-7t0f8t@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2025082009343873c4dcd8407e92265d for ; Wed, 20 Aug 2025 11:34:38 +0200 X-Patchwork-Original-From: "'Kasturi Shekar' via isar-users" From: Kasturi Shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH 2/2] deploy-image-wic.sh: fix shellcheck warnings Date: Wed, 20 Aug 2025 15:04:17 +0530 Message-Id: <20250820093417.41825-2-kasturi.shekar@siemens.com> In-Reply-To: <20250820093417.41825-1-kasturi.shekar@siemens.com> References: <20250806055438.3318548-1-kasturi.shekar@siemens.com> <20250820093417.41825-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=fm2 header.b=OY3uiOP7; spf=pass (google.com: domain of fm-1328757-2025082009343873c4dcd8407e92265d-7t0f8t@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328757-2025082009343873c4dcd8407e92265d-7T0F8t@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_H3,RCVD_IN_MSPIKE_WL, 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..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