From nobody Sat May 21 15:14:30 2022 X-Original-To: dev-commits-src-all@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 91F8C1AEECEC; Sat, 21 May 2022 15:14:30 +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 4L56ZZ3jMzz4TVg; Sat, 21 May 2022 15:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653146070; 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=AwA4kIWoF9eff0bpDtGRMkLQmT+i0Hjg39HIE5PeNxo=; b=XaeJVgLKtsuIiDLRx62/3Qq/Y59Qb6XmjmG7+kghDh0//Rxul2Ix93puKRMFFBmOlRW+VL Id4KKY2FmRhW4n6x6oPZzCHtmimGcwonDQkC/wQ28UBrQfZT634t+TTyhpASrobskadIzT ucVFPByc79LyTwVHlYYWke+hvg7zRutkfzHqyFAoLCpuR2ABgdjeCAEiCcejfsbB8QZGf5 Cu2mikTfOy2L44uDaGIcPeJu9SVSOr7n8nul4Ddg/U9hIHJrNjLpua0hUgx2+4jPWncAed Nsm4JS6u5m3DPTGRo7gOvHrdn0pchT7MIlsR4q5NTcZ4pjTwSUnJasULMLpXgQ== 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 5E7241417; Sat, 21 May 2022 15:14:30 +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 24LFEUNH026870; Sat, 21 May 2022 15:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24LFEUge026869; Sat, 21 May 2022 15:14:30 GMT (envelope-from git) Date: Sat, 21 May 2022 15:14:30 GMT Message-Id: <202205211514.24LFEUge026869@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: 4effc38819d9 - main - bsdinstall jail: Replace dialog with bsddialog List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 4effc38819d9c9b410cee9e3b51f0cabeec27677 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653146070; 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=AwA4kIWoF9eff0bpDtGRMkLQmT+i0Hjg39HIE5PeNxo=; b=pjtHbIa8DssXYchqA/kxcJxaJ0vTdwV9An+p5Ibcaj+q8gMCWti9Mx1AG0lc9T5Fzo69kv Idba+es0BTzLM52IAwuxU8waV/9l+EYEEkfc1fYIOkVvWG7i/6wKvWoP9M308+WywHYKbr MefeRTZ/MRDDg2aY1aOjuY+PCATP2lNdHv9cr/7Lc/BzbH3SvRMdzKhrIUzs+pFbHhN0HI 8CmZ4vz700VpeQX3q3nXY+eHvpzXQiTtSU1TYPIPJSOTHIB5zygXbX8uiTixxKiGvuHwkr pkhqGt/2gKFPG55OdX0nKRggmewY7bdjvEr9ikxxo03/NCNL+QZkH9CXS3iwrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653146070; a=rsa-sha256; cv=none; b=UcogUzO/zJQ4aUHH3Aa6uhDgGpZ8i2/+BRSMkco5F2LN5CE49+aMyH1TGv6pHPX1mBiKWe XN4l++w/cadn4oSq4cgNuOvRuec1zjlS/UwutmpW+9Q9hLNgh2RkRVDf5gfv6fJ09vNyPq TnKIEGf0sBaey+kIKPpxq7kj00vRQmIhIQR3gnsvSPbRoP/F3bMSOXoa7pGd5hS6bBd/PC EKZY7K/TuPSOOWotfs4UeizC2TWNL+FmTGsXeELjCWR+DBDRA9IGZdpZz+DJwXpBjtE8Kk b7C//g2dx/G5uSqj8on6oc7WM53qamqKX2eBLeGI0Ec8yWjQIbdAvsm0LSH6ag== 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=4effc38819d9c9b410cee9e3b51f0cabeec27677 commit 4effc38819d9c9b410cee9e3b51f0cabeec27677 Author: Alfonso S. Siciliano AuthorDate: 2022-05-21 15:10:35 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-05-21 15:14:03 +0000 bsdinstall jail: Replace dialog with bsddialog Replace (LGPL) dialog utility with (BSD-2-Clause) bsddialog utility. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D35274 --- usr.sbin/bsdinstall/scripts/jail | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index d3a84f872fb6..849016ac0f3d 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -34,6 +34,8 @@ BSDCFG_SHARE="/usr/share/bsdconfig" ############################################################ MAIN +: ${BSDDIALOG_OK=0} + f_dprintf "Began Installation at %s" "$( date )" export BSDINSTALL_CHROOT=$1 @@ -42,10 +44,10 @@ error() { if [ -n "$1" ]; then msg="$1\n\n" fi - dialog --backtitle "FreeBSD Installer" --title "Abort" \ + bsddialog --backtitle "FreeBSD Installer" --title "Abort" \ --no-label "Exit" --yes-label "Restart" --yesno \ "${msg}An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0 - if [ $? -ne 0 ]; then + if [ $? -ne $BSDDIALOG_OK ]; then exit else exec $0 $BSDINSTALL_CHROOT @@ -81,9 +83,9 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then if [ ! "$nonInteractive" == "YES" ] then exec 3>&1 - EXTRA_DISTS=$(echo $DISTMENU | xargs dialog \ + EXTRA_DISTS=$(echo $DISTMENU | xargs -o bsddialog \ --backtitle "FreeBSD Installer" \ - --title "Distribution Select" --nocancel --separate-output \ + --title "Distribution Select" --no-cancel --separate-output \ --checklist "Choose optional system components to install:" \ 0 0 0 \ 2>&1 1>&3) @@ -128,7 +130,7 @@ if [ ! "$nonInteractive" == "YES" ] then bsdinstall services - dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \ + bsddialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \ "Would you like to add users to the installed system now?" 0 0 && \ bsdinstall adduser fi