From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7387032429685374976 X-Received: by 2002:a05:6512:3c85:b0:52c:dbbf:c413 with SMTP id 2adb3069b0e04-52e8268b421mr6025505e87.34.1719927516456; Tue, 02 Jul 2024 06:38:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c96:b0:425:6710:f9a3 with SMTP id 5b1f17b1804b1-4256c7b7b1dls17922765e9.2.-pod-prod-08-eu; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGd3BUkXt4/9pWSAiUmSM9eVEskGGEdRcsSnT58wXPuYon9arjv3Aa6jyuP3IBF0Bh448LS X-Received: by 2002:a05:600c:2299:b0:425:7c99:eb59 with SMTP id 5b1f17b1804b1-4257c99eccdmr56693425e9.33.1719927514175; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927514; cv=none; d=google.com; s=arc-20160816; b=sL6zWdH9qwth8cmCVdyqFraP9l7d40Qa2jryn8GeeIUsQ80swXTd3PgRT8mvq3J/+2 79A4vx27+LIpQqTwImsivRFd04QKkEmnfAaBZga7D/l182a4a88IZYDqSqBqTQwU+FeC sUDeE/ZsgcR/2KXMUoYYRxeLSg3OscexLceItt+L8jlPhzanX6LDLUIdXAOsbi89gGzB VgltfVF5+v/wdOBP3PwEq23Dhy8BS3eG99sK3LjT2I8b9GttZ/SA4mhe/Q1Vljoanjea 24AX3TckKejgN29SlQh0J0IRJyBdXBPr4bfcJ5fHXFCW0JtFj+CCmb3+1xOt3T86NPKS od4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=N2xjuRmRR54exWzAB3/mj+0GUcH+tsxgBQpNqwUb+eE=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=exfCOeayS3IPou3QfFum+QOyqOH+pJyIak23qJLilJYK3SQDSsg/9d7663kfq7xp+o hIt+ygkRn1Dw8z67mE7ltJynI5YbiICd5Dw5affT9mXrdtkW+rWD2vcBZGmM4zvvkiqg JpFrjTL8uafjU7jVFfb8z1vSbTI6fAoDKZQt1+t12M1aYGXXRz9vYs2Q+VGBwqHRSQUz GEGh8F7hxR6q2SS5RGE2FzFkziB5z7WRQWZEQAu+OCQCS3AfHJRNCWiv4TQYqcoaYNDH LdPO+ny5hE/8r1tgBG67g8l3Q/yIPL2zZWyg2p5gLdx6WgRGOpZIltzZBMroi7502Pn3 UQAg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=UqYkjj7O; spf=pass (google.com: domain of fm-294854-202407021338338c589c454df3f7ee4e-irhjxx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338338c589c454df3f7ee4e-iRHjxx@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-4256b090706si2040335e9.1.2024.07.02.06.38.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:34 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202407021338338c589c454df3f7ee4e-irhjxx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=UqYkjj7O; spf=pass (google.com: domain of fm-294854-202407021338338c589c454df3f7ee4e-irhjxx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338338c589c454df3f7ee4e-iRHjxx@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202407021338338c589c454df3f7ee4e for ; Tue, 02 Jul 2024 15:38:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=N2xjuRmRR54exWzAB3/mj+0GUcH+tsxgBQpNqwUb+eE=; b=UqYkjj7OhiBZgXTrFEfsgbiPOPpSRTLZlVo3ECn83JUAwVav9nbaOj+grbonvg0jsUMSSX DImtSM+XrPB6e8OcVwG9WsTKxERlR7y/EH1vm4BjGlu4ieBANf8DmoBbTukNaH/DOK5NeOFf +c6kjHGy2fkxbBrXVDwN+0Ap4uAD4=; From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 13/17] meta-isar: deploy-image: Polish some dialogs Date: Tue, 2 Jul 2024 15:38:27 +0200 Message-ID: <861ba578d809bcd01d8dfd3b9ead57e733baafdd.1719927511.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: EggTceeT/dPK From: Jan Kiszka Add linewraps at defined points to the start dialog, strip spaces from device size output, adjust formattings. Some other message boxes can be shrunk in height. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh index 673b2eb3..5ae62a55 100644 --- a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh @@ -22,7 +22,7 @@ if [ -z "$DISK_IMAGE" ] || [ ! -f "$installdata/$DISK_IMAGE" ]; then fi fi if [ ! -f "$installdata/$DISK_IMAGE" ]; then - dialog --msgbox "Could not find an image to install. Installation aborted." 7 60 + dialog --msgbox "Could not find an image to install. Installation aborted." 6 60 exit 1 fi DISK_BMAP=$(find "$installdata" -type f -iname "${DISK_IMAGE%.wic*}.wic.bmap") @@ -97,9 +97,9 @@ if [ "$(echo "$target_device_list" | wc -w)" -gt 1 ]; then else TARGET_DEVICE=/dev/$(echo "$target_device_list" | tr -d " ") fi -TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE "$TARGET_DEVICE") +TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE "$TARGET_DEVICE" | tr -d " ") if ! dialog --yes-label Ok --no-label Cancel \ - --yesno "Start installing '$DISK_IMAGE' to '$TARGET_DEVICE'(Size: '$TARGET_DEVICE_SIZE' )." 7 60; then + --yesno "Start installing\n'$DISK_IMAGE'\nto $TARGET_DEVICE (capacity: $TARGET_DEVICE_SIZE)" 7 60; then exit 0 fi @@ -118,5 +118,6 @@ if ! bmaptool copy ${bmap_options} "$installdata/$DISK_IMAGE" "${TARGET_DEVICE}" exit 1 fi -dialog --title "Reboot" --msgbox "Installation is successful. System will be rebooted. Please remove the USB stick." 7 60 +dialog --title "Reboot" \ + --msgbox "Installation is successful. System will be rebooted. Please remove the USB stick." 6 60 exit 0 -- 2.43.0