From nobody Sat Mar 26 00:38:23 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BEFDA1A35D7C; Sat, 26 Mar 2022 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQKnW4zQqz3q2p; Sat, 26 Mar 2022 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648255103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQgll8gX7OoQN+PDhaW28PP+E0f5ea8lE41SWmZT2Ws=; b=hxMpNkvRNSfSJmBt0Kqd8Gl7CoitYczsiGmXMuT57ISqxEXjTLRqYC6ii192vzJ/swtrZL XSr1c1ykhulWp8jLhs7uwsq4LEdS0f8n1NP8Bz7pucIwYsV7zQ/EQztoSBbfFhl1YRlKeo BnLSyM13Bf1OVOFWaX1mmAWMe6wFGbXajgpUjWiX0hc5D3BmY7tnB+f6RIOiHWLrV3kowT g0ZzbXiZ11dTpjtwzfgbQZUe7UMRDldUrQJW/XxJKzeLA6QBMA7hbPFGDooCNtQ5tK0zIB 5yVZELLt3A8ys9DB5T2K2uxgVuwEGprhqJxC20hZa9ixV0Ba4BG/WBhzz906Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7C8AF17095; Sat, 26 Mar 2022 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22Q0cNXL010384; Sat, 26 Mar 2022 00:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22Q0cNnn010383; Sat, 26 Mar 2022 00:38:23 GMT (envelope-from git) Date: Sat, 26 Mar 2022 00:38:23 GMT Message-Id: <202203260038.22Q0cNnn010383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 0868f621762a - main - bsdinstall checksum: Replace dialog with bsddialog List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0868f621762a949ef2b791c3199817436a79d3a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648255103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQgll8gX7OoQN+PDhaW28PP+E0f5ea8lE41SWmZT2Ws=; b=tg7IC07Z99lpntC9TBso7fkAlnRCtNR8SNAXLf/MMMj4q50BIp3CgZWrLuq9cqh9ekO3wN kQz5sNid5lMbYvLctGydLY2X+fYDLHrxmo0jDvt+M9Fbdy9BVdB7Ln4pKA+RmTTnW/TnHz kudvLaul0coIZoU2NoTOdkk4Na/TvBWMNGAS+xNL7CW7ZsaaariTVlDjHkHfAC1udHeBL5 USs9EaKpJVNRl+qCsuNqp+CNOcz2FCzcYh5qJD13eoITzPU+Xk6CHCBltbYl0tGOAElPD7 y+38jcm0mSKmMQrMo8aXLXcABJ64BGBPSZoAD4F65+bTgu3tEy0IKC92eBLEsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648255103; a=rsa-sha256; cv=none; b=x/gxacUS6vahZr5apHcrKbJ7vRNAiyeSizMkJgkWOW9iiklGFjf7lUbRMFNyQyAvtRkkjK nezYB2YncyHuTMQZjPHGvlYTNh0S2t0dXUNt+SKnnMcn8/woUJLppbukfoG6PE4qMXchMQ 2IKPWcvlrMX68AhXag3GZz8asErxHPgakbnEOXkmJ7F7fqidzGcVzvXoVzpIcU3KMIdLD6 mCHpYlZSvO94LoG7hUbid/E8NlDn2PazOplyoMGxytaQoct6mzNEsuUYghQndshM2xNTLc Nbpuw/V1M5PgKqPkFmW1/3Gsru+x5X+UdLjdf/GuCNWnhvFGZk5Zk/bj/myoMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=0868f621762a949ef2b791c3199817436a79d3a1 commit 0868f621762a949ef2b791c3199817436a79d3a1 Author: Alfonso S. Siciliano AuthorDate: 2022-03-26 00:36:13 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-03-26 00:37:59 +0000 bsdinstall checksum: Replace dialog with bsddialog Replace (LGPL) dialog utility with (BSD-2-Clause) bsddialog utility. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D34660 --- usr.sbin/bsdinstall/scripts/checksum | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/checksum b/usr.sbin/bsdinstall/scripts/checksum index ff404d7f587b..0bb0dd512d31 100755 --- a/usr.sbin/bsdinstall/scripts/checksum +++ b/usr.sbin/bsdinstall/scripts/checksum @@ -31,15 +31,15 @@ test -f $BSDINSTALL_DISTDIR/MANIFEST || exit 0 percentage=0 for dist in $DISTRIBUTIONS; do distname=$(basename $dist .txz) - eval "status_$distname=7" + eval "status_$distname=-8" items="" for i in $DISTRIBUTIONS; do - items="$items $i `eval echo \\\${status_$(basename $i .txz):-Pending}`" + items="$items $i `eval echo \\\${status_$(basename $i .txz):--11}`" done - dialog --backtitle "FreeBSD Installer" --title "Checksum Verification" \ - --mixedgauge "Verifying checksums of selected distributions." \ - 0 0 $percentage $items + bsddialog --backtitle "FreeBSD Installer" --title "Checksum Verification" \ + --mixedgauge "\nVerifying checksums of selected distributions.\n" \ + 0 0 $percentage -- $items CK=`sha256 -q $BSDINSTALL_DISTDIR/$dist` awk -v checksum=$CK -v dist=$dist -v found=0 '{ @@ -55,20 +55,20 @@ for dist in $DISTRIBUTIONS; do CK_VALID=$? if [ $CK_VALID -le 1 ]; then if [ $CK_VALID -eq 0 ]; then - eval "status_$distname=2" + eval "status_$distname=-3" else - eval "status_$distname=6" + eval "status_$distname=-7" fi percentage=$(echo $percentage + 100/`echo $DISTRIBUTIONS | wc -w` | bc) else - eval "status_$distname=1" + eval "status_$distname=-2" case $(/bin/freebsd-version -u) in *-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE) - dialog --backtitle "FreeBSD Installer" --title "Error" \ + bsddialog --backtitle "FreeBSD Installer" --title "Error" \ --msgbox "The checksum for $dist does not match. It may have become corrupted, or it may be from a newer version of FreeBSD. Please check for a newer snapshot." 0 0 ;; *) - dialog --backtitle "FreeBSD Installer" --title "Error" \ + bsddialog --backtitle "FreeBSD Installer" --title "Error" \ --msgbox "The checksum for $dist does not match. It may have become corrupted, and should be redownloaded." 0 0 ;; esac