From patchwork Thu Aug 21 06:39:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi Shekar X-Patchwork-Id: 4302 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 21 Aug 2025 08:40:42 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f192.google.com (mail-il1-f192.google.com [209.85.166.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 57L6efmQ002792 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 21 Aug 2025 08:40:42 +0200 Received: by mail-il1-f192.google.com with SMTP id e9e14a558f8ab-3e7172dea48sf10377505ab.1 for ; Wed, 20 Aug 2025 23:40:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755758436; cv=pass; d=google.com; s=arc-20240605; b=Pv7jSB4XnhOo0Vkzn8NuATqCLHYBAZ2O8t0hyga+8O+/d055DK/mrpnDWvg4T+aZ6D Ak0oUgSGWUG685DBrwAIxknqyvdEqtTGUsU8jYsk4VClzlU1Ms32P0qb3QCPf/CvTzBU GOaocQ6EUwPsUz5kVco2CIJXkE4BECudoudwqAIl7oZceEpRS87Z8pR/E9QVBMfAVolP BERPVBQi3WoYOXeQrqi6KQm/8J279Mib3aX8QLxsEzdhRtUUcfR1rtT2lHaCgbXOjcCt +NyudDz5ids5pLhLBgjAFTPEJfNV0JzBA/lOPtuKIt0/eNw9sUqYRmO3rpxMT6bZSW8v oRPQ== 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=M+8mrMhZX2vsfEaJHRkw+hpZovqgmZ1GVRrCU8P2o/Q=; fh=Q3NBEX75fGgs8Y2fzhxhmAQOPmpkNikpmvq6HY2EIHs=; b=QDWwRKbFbCKj2wWH3Q/QhhCNHoRHFOuBhV4H4iIANRjywhsQdqhXc2nRr30X6K9R0X L58V4Z4YebDM+JcyL+tERHChwH6EHN/hU2WtM1kj0HCfSA9GPf4T+57AzqSH33sWmJkt z8e5ydKUUzhRN0zf0ETs44g8ad/5i2FOzfosgcT7fPxPQ6XNz2a/IjpyYoGop9PZf1TG twr2iVCjVXGo8SP4yVdeoa3GIwkYku6NTlhTK/iXelwVXnt8j2IZxP4UXaMA7gQn/nL8 aAD7/Yn3hppoW5svEbkJACkydjyPQ4uJc5GbTLbMaudN9KkGhcV9ZNB2RBbErKNG3Vx+ IXXg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bbBot6jD; spf=pass (google.com: domain of fm-1328757-20250821064032736256501682928ced-mgs_zu@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-20250821064032736256501682928ced-MGS_zU@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=1755758436; x=1756363236; 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=M+8mrMhZX2vsfEaJHRkw+hpZovqgmZ1GVRrCU8P2o/Q=; b=Qp7cy7mA/9t6sh3wsMnhNRBy2N7bPpftwiV7ymF6qN8ouEb4RBrwa0UAWyEC2WC/Ox s03YVaFtUgd60wy3nPZZGxcNEbsRGVwpeZizDbzUZzUqB6pnHb/Wp/cIJ+dpImsNk2qQ eyoF2hCHqN5b+ADmyq58L7bTZrpKjb+qtFNaWxpKcn3IDjkKVdNKpXSi2r8fUvP4nCZE +xA9um0ENvaWIUDH1Gq0FqVI5/vcp32l4kkBt4jmiwuT2cao3XjwRCEBFsHbOg0aEO8d z+mNSQpGxY1KeESSXcfAhJdeR0wXYVXxpgIfb0Z5n6wGlDgJ76bj32qGS+fitPTza36R HKQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755758436; x=1756363236; 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=M+8mrMhZX2vsfEaJHRkw+hpZovqgmZ1GVRrCU8P2o/Q=; b=IrGqezL1Jby1NmDi57CXbFngwVeSw05bG6ln9DKhvqn2LSBiTGg3QsDhNLCPSmdZoo UNAWH/w2wH5VwkTjvFZmQBKnX2jj+4iLA9AQd+luEaGbldbKvNXMqZgVziZPEFHmnzcX h85I/LNX06cptwf6BYhTVuJwMxJbX9sKPT3nIKMPvowdf17aLTZVIPYc5OPmzs7nw8aj jXRbejki72ryVjxWJagzthWla1iXpiaVzmGzxw/TCg7G6ISU2uZnxp9w7nOOid8YahUj Q/aon9buUxxQ3d7yr/pUU2Sv1z+K/pcTU0DlCUhaRCUdsoRnpdwZ10VMpOWsXmgpKiVf oFiA== X-Forwarded-Encrypted: i=2; AJvYcCU4RYZgq3fiOOTUMKTfsV4MF6P8h+yq6dYQdwFyi9xoTcPIOpQzeZyXf/XkSYpJEm/fcGlHj6o=@isar-build.org X-Gm-Message-State: AOJu0YyMGz8cZ92VWobvQ7V3Jkqo9ABT3IdGEMNTvck7vhZ/qcR+CjJW bNdAu0dRwGBAQZIST460DSr/fImGXrLv3CJ9trfnDupk93dtjUN1CH+l X-Google-Smtp-Source: AGHT+IEvRtpSc2MlwgQNbH6+WSKnE/ahG+jQ2JLbvIc5p4JmjPllNcdOoLqSPj3zhpSVAQ0qhVMusA== X-Received: by 2002:a05:6e02:1a6e:b0:3e5:42ec:1372 with SMTP id e9e14a558f8ab-3e6d78669b9mr22831385ab.19.1755758435657; Wed, 20 Aug 2025 23:40:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZdEBz6EpBtg9X/oTicJ6KuAsx3DT9wxXOeaQ/b65mvNMQ== Received: by 2002:a05:6e02:930:b0:3de:143a:a012 with SMTP id e9e14a558f8ab-3e6835a1732ls6084865ab.0.-pod-prod-01-us; Wed, 20 Aug 2025 23:40:34 -0700 (PDT) X-Received: by 2002:a05:6e02:1789:b0:3e6:7d65:97c0 with SMTP id e9e14a558f8ab-3e6d3b7f534mr26272995ab.1.1755758434769; Wed, 20 Aug 2025 23:40:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755758434; cv=none; d=google.com; s=arc-20240605; b=Tl4jGXUwLDntr5dwTDf8gN3qXKdzAEElQTEZ+KYgOcb49NpwFIOzJqIB/qAjw0xU1V cmbg6cTJfxOwxJmJvgH7ejIm9fcPD1DBsRnBGprNbopLHyGErb/OF4NivhCSFdfXmyFz wb2Jd24UwYXbKKfyceIV7HLuazB6XKggmVCUKFqS4QTjQusp/BIVzNk38YKBlt23uhiv 9tBsJ65KjPYdK5ipot/xy5qXddhw+oqhdjksgZMlYA6zAVwtlmn0SQoP8/4zHs6X0tgW oXlBpiLEaD5f/mzFmrd6SsIOsgsLDq2n2lIN3H4t7EPf1RTrwglcqu3K3V2MId6w8c/D 94Sw== 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=RItBffOaRNPeK7Wqw4tWsEc+et7IBlZP80bAp+U5pm+or+uii58LuoD7RGyEuCz/dL 5pCH2Z1ro9yGif3ijEylvFJoBGwV4DpfPfE9z3HTXu4J0uvbdd5EHKtiB6dn0rWe363U 6OJ5z9Mq6b/W+mlOo2RE3Zk5L2pvfIohvT42oEKRerJjkto5QN7sg+28pop7US7Q8BWV JJQu1gBY6vqLlfTAs4X5v2Nm0HZplurajj3IFghZXsTaoUNfK7PxCZr2PYNd+lEHzQyH VfIH0lQsnUp/jRu4xYuYyMRefK5pQMuqlwSps79ZT48geRkH49khDZQapzinULExusjq 7NnA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bbBot6jD; spf=pass (google.com: domain of fm-1328757-20250821064032736256501682928ced-mgs_zu@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-20250821064032736256501682928ced-MGS_zU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id e9e14a558f8ab-3e57e6655b4si7439625ab.1.2025.08.20.23.40.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Aug 2025 23:40:34 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-20250821064032736256501682928ced-mgs_zu@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20250821064032736256501682928ced for ; Thu, 21 Aug 2025 08:40:32 +0200 X-Patchwork-Original-From: "'Kasturi Shekar' via isar-users" From: Kasturi Shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v4 2/2] deploy-image-wic.sh: fix shellcheck warnings Date: Thu, 21 Aug 2025 12:09:43 +0530 Message-Id: <20250821063944.47909-2-kasturi.shekar@siemens.com> In-Reply-To: <20250821063944.47909-1-kasturi.shekar@siemens.com> References: <20250821063944.47909-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=bbBot6jD; spf=pass (google.com: domain of fm-1328757-20250821064032736256501682928ced-mgs_zu@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328757-20250821064032736256501682928ced-MGS_zU@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