From patchwork Wed Aug 20 09:12:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi Shekar X-Patchwork-Id: 4292 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:13:25 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f63.google.com (mail-oa1-f63.google.com [209.85.160.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 57K9DOon028212 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Aug 2025 11:13:24 +0200 Received: by mail-oa1-f63.google.com with SMTP id 586e51a60fabf-30cce58018esf13485160fac.0 for ; Wed, 20 Aug 2025 02:13:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755681198; cv=pass; d=google.com; s=arc-20240605; b=JTXGD6Jpqb+jj1zWXGHP/u2lqR6z4nbQAAu7Lw/g7APKDTu8++n9MGLblGiXW4RDTA AFnFwpgd+vdNDiGKcUOqIowJeWdrMDxV3YqDQnxM2Pg3gt30eOwsfB6IuT8moavYpuvJ 4FGeaRRwaOQb+ypWCHO0joQ9/f+8G5y8ZSavjbfPrJ7ZO5tajTxukgVnOcLuJQfvKT2f 8V4+dDsuK2kq/x98y70kcxwM5LC++ij8KEEUg4kp3pfPuRNF6fXvyH9pXIIrqciQWL+l XXM3SMvkSQGeoQrN8vDFbXocQPxId+/+WJ+goO8zccolouLW2k7eIZDrclVzZxxwTaS1 S9Yg== 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=BlPAu2qKfEIK7UJLzfYu6CGOvqe9YIEmzh6xFthBuPo=; fh=FmAV0ma/yurCFGDMRR6FFeAI6zbwMDNNVR2+l/B+/mo=; b=Dlz2GKwZ0doaXRNV+jSGkA//6FniFe/ln8Dp0pt9JDm1KWwLAUeRCJNnEn0d59iYl2 g8Z0LApA+TumHROWnSgae44dgQSKvUibq0Glu2gPV/fLA4uqeeIQ58gMCX6NINjB0ny0 ZpID7Dn+bUC6tIimdZc9aagraIoYG9QGoFX+dPrHcM78Co+5n10Q7BkPH2m2Pb+GrXaa TmM9gWdneiN1pwbBmjOOzs911wm3SYAB1BCPhCJyMRqh70b5DaWitBN5yEgW243qq6Y6 ezEUsLGdHZeL3AkiZtVtti8RtTd0MZUCwPXDavRDAJyAuIZLndRP/fOrRsBZb1A2hr1T VM5g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=EuMQfOz+; spf=pass (google.com: domain of fm-1328757-202508200913156c990a444f3285a57b-fddyec@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1328757-202508200913156c990a444f3285a57b-fddYec@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=1755681198; x=1756285998; 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=BlPAu2qKfEIK7UJLzfYu6CGOvqe9YIEmzh6xFthBuPo=; b=WedHZ3ZKFIViXR5GKv4FaF3hOUuuJbk0wabIy0KDmsUsW0UAvZIvEa70KTEws0oPqX 5sqhmKZDw336aaS/nKY0kUdCFXuL43Cf61LQXKlJws9oyADCIYbtih4H2HesRWhrx/DM /6x0LE6x49zEv+aZYGeHfUKCEGLOVexgLnky/zE3CdHU581iK0Gc+YldK7R3xq3wRzWO 2kUlNPl69z85HGYx4pPnx46AbwNAaJTmePjkvyWfUxC4eSBAKJVBwFiNe6O9FGza8mLz SQaon0JxyqliWA/kUinI5qPJ9MugT0dGhDqbx8QsO93gkQlbY4r9uhiJGUAH6s0JM6/4 qZ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755681198; x=1756285998; 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=BlPAu2qKfEIK7UJLzfYu6CGOvqe9YIEmzh6xFthBuPo=; b=NosgqiSq/p72Y3XfgdYic2VrW4DSNzsqdwNW4Ne5Svhp1lo/q3NHWieyYn5rTtdgyU jtFzL9CclelNkmGP+oEOTCiCqlUaYvrjnUG7EYvNeaCJ013Y06SQntek1E2cRhD7fcsQ AJhmQ0v1N5xPmUIQtFZgbLR4h7yCLXB3A1EfKSiGRiXvJuRkKhlatTkGmcZq6VeNsT8z pK4a9yN1JujiHKXdQUYekoZt/70eysmmtezDYJc93la4YmQJX8UmT0EiwdpuNJ1QVrYt DaU1u99dYBpmZG3M7Jtu6EGOoCHmCE3r3cbLAjXAi2bKWAAHzq3Z6ixvpnayhJhZsEKh YazQ== X-Forwarded-Encrypted: i=2; AJvYcCU4aZwj6+CRNM4IV6d14GVmvaOAFzi581EA4G7UTeyrrAAMX9Lp99Cr7mf4yqnsnPaQKwW6eOs=@isar-build.org X-Gm-Message-State: AOJu0YxlexrzRnk7krMUeF8hWO+aZ+rcpGvKlWDGpuP12uE8rW6DsQtW 8lld1QmwWzI1y7EVS16F+4qM7Obona7qVwCasbG0kJqVbFPt/GS/WjQ2 X-Google-Smtp-Source: AGHT+IEDLETP3Nr6qW9ovASCbu8h9VP8e/siK4tIO6od4PjK9DnZt+41JQBd9+FHl6HTOaTzVj0oyA== X-Received: by 2002:a05:6870:37cf:b0:314:b6a6:685b with SMTP id 586e51a60fabf-314b6a66b8bmr293297fac.41.1755681198371; Wed, 20 Aug 2025 02:13:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZd/Z4LRDMcFyyIRMPQ2XOP8OIQO74BeR1Gfgk4te6zwvw== Received: by 2002:a05:6870:15d6:b0:30b:c665:1d65 with SMTP id 586e51a60fabf-30ccebf8997ls4137298fac.2.-pod-prod-05-us; Wed, 20 Aug 2025 02:13:17 -0700 (PDT) X-Received: by 2002:a05:6870:6710:b0:2d5:4f4:e24d with SMTP id 586e51a60fabf-311227800cdmr1230949fac.6.1755681197244; Wed, 20 Aug 2025 02:13:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755681197; cv=none; d=google.com; s=arc-20240605; b=LTTxVi1cDPUKpFgwDqtssk8nxvi2kBTcmHP7PyPa0eO4Q0ZZDZVfyefxZMPZ14dorK sY2KlwSMCv/aWa58ozCe0+0CmN4NMGvts+nnNM7tab9Z6zwxsgr4BCuvAwgLRxc6QkBO OYrLieX5njD0Qb13CtGDrEzzxvxXCTEUvGlkVn32TeihlZCzye+WK0cq49VBG2ZjZNAK AvtHTG8hjdWgASvcV5+cEgqW0gPY6zwUgwOzOVi6FyzpKwOngQ6dm+MzAddTzaQM2rvB 8SCql+37RsaaxKdYdEIQi7fdkTiI1/S9ch4+Lbm9eArQiqUQQdK0oNbQsXlNyfAxGcOZ D2EA== 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=KXd5XtYnB4TyMVVXsW2RPVIcIGgjniogcC7Vm8e8crzGjcAlQqeQQp3z51Q3nbdELh 6pE2hDHub5QKkEcr0IAuwz/z+jwNZTeo3E4gwivq0onnipSp891ca0tWYBMpriKplyKi fIXU75kLUVzv17c256qegreBOxHvlkRcpTKIQaO/Ab5NhSHq0WjlJ92SiBe23QznUnmc 7/F9Zu7GDFyXplbcoRYRutdjx5zFvxK0TpJ8sL8hN1sH/ZQnTbmOq/eE68MqM1ezfE7/ YaAGAC4a6ddNmIoxmvfuCrob+Oqiv3cts7bDq6fXIzd6oLroalY7QVvXY7goWyN+QFBk sRgA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=EuMQfOz+; spf=pass (google.com: domain of fm-1328757-202508200913156c990a444f3285a57b-fddyec@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1328757-202508200913156c990a444f3285a57b-fddYec@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id 586e51a60fabf-310abbcfe0dsi613792fac.5.2025.08.20.02.13.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Aug 2025 02:13:17 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-202508200913156c990a444f3285a57b-fddyec@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 202508200913156c990a444f3285a57b for ; Wed, 20 Aug 2025 11:13:15 +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 14:42:32 +0530 Message-Id: <20250820091232.41738-2-kasturi.shekar@siemens.com> In-Reply-To: <20250820091232.41738-1-kasturi.shekar@siemens.com> References: <20250820091232.41738-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=EuMQfOz+; spf=pass (google.com: domain of fm-1328757-202508200913156c990a444f3285a57b-fddyec@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1328757-202508200913156c990a444f3285a57b-fddYec@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..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