From nobody Mon Oct 23 14:02:41 2023 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 4SDcMk3CPyz4y5DV; Mon, 23 Oct 2023 14:02:42 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDcMk0nPvz3flb; Mon, 23 Oct 2023 14:02:42 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698069762; 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: in-reply-to:in-reply-to:references:references; bh=nwK4zoYxIQthTKTmLpvLA8Cv814PaqMF0n4OP24SIQM=; b=Ne2AzvadxgmyM7rqsSi56dmEKVqusMOy9wV7OuzMYD+0W2EhTn4tkzNj7AJnuQ6Q2xTeW+ DQs5hOGkyvjbgoY9XcY/VvdR9Pe6kXOBr85RJptKrRxndDZkht/1+HDB03cT/Jo0DW+KXR ljOG3Z22CZJ2WxCegG6qwXaWVApdXClJ9qKsmvdvTzUHLDA5Ai7gWh3BWbP+JGbqRnfksq ophkHHlEhag4zKnFwjaef+BlXVgkf2hnYErB29YdKdBlH+EAu9Fqf45D9eXv9BTXpAP3Uo itQd4HtWz+pSU8VQf5/wHEkmvzypsrb1iNrTL7Xy+nr6RZUYCotnKAP9a8aaYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698069762; a=rsa-sha256; cv=none; b=HZ99xVaH2L+nBKawnfVD7ab5Uq+X2h+9/ujEuFEEDZ69I6/mOKhQGsJpEWP5ofirFCh38P YDVsJ3pVP8Cssbw8lhagoSyPjgg76ez5w6J2CcCjJM3efOChr5rjqN/j650B02RGYASurT fQTmWs36Qi2IFVbR7Lvd9YEx8ALCFwnI45agwCFVGW9J6rTgzU+q2Cfg8VJdYtDvBayQ88 b9kzdNVt0gTHVtJkjrdM/wFmecZmx7MLN1A8rhgOTnj5u5ctKgOZtkg4Vag3jC3dszZ1zM GPzby8sg7pyGWKDEia2MORiMY6PWyaHS4awxFzqvG8l0Aw00PwiEzPRJ3ywGpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698069762; 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: in-reply-to:in-reply-to:references:references; bh=nwK4zoYxIQthTKTmLpvLA8Cv814PaqMF0n4OP24SIQM=; b=WjBtuKG9wVV5G96V/Ozy00/sKwftw8RE2k9hZE4oZAJ/blGww1GENfZB0gjIDwxO+Eu6Ps liZMGuVSMwJU6ny1zh15Fr6W4QrjgxjbTtrLXwRgo0hmv71Ohs3boSED58M3fLxJC1aMSZ kAYm33cW9JT6AGPJrfKMQ+IZdig3rWtA5VKim3Y+SkV7gNVzs1insx9fMuHZ/3PbGgJO3q hJiZ45KHuVgG3q+A1zzOV/RHcJwzXwRy13rtu+M4dGr8HrRyKLRGiOcvmzuD/vofiYIF3p ZHnZaOqtLtvcWJ6l5Df9YgtBYxrSkliGkkHjtpUSb4SpfSNIAsMY9cOOjxuYPw== Received: from [192.168.1.9] (mob-5-91-113-109.net.vodafone.it [5.91.113.109]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: asiciliano) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SDcMj3Qnbzxk2; Mon, 23 Oct 2023 14:02:41 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) Message-ID: <04a67092-cb7d-43ff-9e4b-948d5c0ed0af@FreeBSD.org> Date: Mon, 23 Oct 2023 16:02:41 +0200 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 0f8b2ba6c629 - main - bsdconfig: Revert bsddialog support Content-Language: en-US From: "Alfonso S. Siciliano" To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202310231400.39NE00x2012137@gitrepo.freebsd.org> In-Reply-To: <202310231400.39NE00x2012137@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 23/10/2023 16:00, Alfonso S. Siciliano wrote: > The branch main has been updated by asiciliano: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0f8b2ba6c629237e4ddd7a72f7c22f687208060d > > commit 0f8b2ba6c629237e4ddd7a72f7c22f687208060d > Author: Alfonso S. Siciliano > AuthorDate: 2023-10-23 13:52:56 +0000 > Commit: Alfonso S. Siciliano > CommitDate: 2023-10-23 13:59:31 +0000 > > bsdconfig: Revert bsddialog support > > This commit reverts "bsdconfig(8): add bsddialog(1) support" > 30e9abf2fc462084b752064fa814d90ad3161352 because it is not intended for > the current bsddialog 1.0 version. > --- Actually this revert is not caused by a technical problem. I had a health problem so I wasn't able to update the review. I apologize for any inconvenience. I'll restore bsddialog(1) in bsdconfig(8) immediately. Alfonso > usr.sbin/bsdconfig/share/dialog.subr | 30 ++++++++---------------------- > 1 file changed, 8 insertions(+), 22 deletions(-) > > diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr > index 0b6f11f39134..5b7ae9123073 100644 > --- a/usr.sbin/bsdconfig/share/dialog.subr > +++ b/usr.sbin/bsdconfig/share/dialog.subr > @@ -51,7 +51,7 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr > # Default name of dialog(1) utility > # NOTE: This is changed to "Xdialog" by the optional `-X' argument > # > -DIALOG="bsddialog" > +DIALOG="dialog" > > # > # Default dialog(1) title and backtitle text > @@ -79,15 +79,9 @@ DIALOG_OK=${SUCCESS:-0} > DIALOG_CANCEL=${FAILURE:-1} > DIALOG_HELP=2 > DIALOG_EXTRA=3 > -if [ $DIALOG = "bsddialog" ]; then > - DIALOG_ITEM_HELP=2 > - DIALOG_ERROR=255 > - DIALOG_ESC=5 > -else > - DIALOG_ITEM_HELP=4 > - export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1' > - DIALOG_ESC=255 > -fi > +DIALOG_ITEM_HELP=4 > +export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1' > +DIALOG_ESC=255 > > # > # Default behavior is to call f_dialog_init() automatically when loaded. > @@ -2227,14 +2221,7 @@ f_dialog_init() > # > # Process `-X' command-line option > # > - if [ "$USE_XDIALOG" ]; then > - if [ $DIALOG = "bsddialog" ]; then > - DIALOG_ESC=255 > - # else it is already 255 like dialog(1) > - fi > - DIALOG=Xdialog > - USE_DIALOG= > - fi > + [ "$USE_XDIALOG" ] && DIALOG=Xdialog USE_DIALOG= > > # > # Sanity check, or die gracefully > @@ -2242,7 +2229,7 @@ f_dialog_init() > if ! f_have $DIALOG; then > unset USE_XDIALOG > local failed_dialog="$DIALOG" > - DIALOG=bsddialog > + DIALOG=dialog > f_die 1 "$msg_no_such_file_or_directory" "$pgm" "$failed_dialog" > fi > > @@ -2274,7 +2261,7 @@ f_dialog_init() > if ! f_have xauth; then > # Die gracefully, as we [likely] can't use Xdialog(1) > unset USE_XDIALOG > - DIALOG=bsddialog > + DIALOG=dialog > f_die 1 "$msg_no_such_file_or_directory" "$pgm" "xauth" > fi > HOSTNAME=$( hostname ) > @@ -2296,13 +2283,12 @@ f_dialog_init() > then > # Xdialog(1) failed, fall back to dialog(1) > unset USE_XDIALOG > - DIALOG=bsddialog > > # Display the error message produced by Xdialog(1) > local height width > f_dialog_buttonbox_size height width \ > "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$maxsize" > - $DIALOG \ > + dialog \ > --title "$DIALOG_TITLE" \ > --backtitle "$DIALOG_BACKTITLE" \ > --ok-label "$msg_ok" \