From nobody Mon Oct 23 14:00:00 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 4SDcJc32lgz4y5dS; Mon, 23 Oct 2023 14:00:00 +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 4SDcJc2XSyz3dwY; Mon, 23 Oct 2023 14:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698069600; 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=Es0lFyOUefH8zhVwmRRcZXEO1N8jxb4APzSsZ+xZAtk=; b=f1lzRKzgaVjVjYnOqql6/lmgBecRW3yALvrsCDld1rXTt7kd65RsHJ6Ko8VpAQC52NrGTO QxFY8khNEcf4Nznv67JiPxmPavNobSOVHg3yocXUL4y7aGoZ5gCD1He90VhkGwNEkjQb/t jGTGfFVl6e5fXu+v7gdsxaVX89JK4vO7bIWWoZKkvhGmYZUI3UuivVa7y3lX+pYEkKOAIN wxpSeJ9MKVvLNoRTFuFRm5JcxbF3tcZZXH/BVMelgJOxjPZAolHctCClHgvicw825KfexE wxXrQAPbuoa/19+2O+pl/8ryPivZVa1U55yf3k20EJdzcuCeaE5BNRJtP05oFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698069600; a=rsa-sha256; cv=none; b=hOhetpOseHet03b7c17KspCdlhnsuxiDdYR6CyuuSX2VfHtkTAfgVt+n/IPSx858y1i336 2xi+fFFSLnHYa9R/gj4dguIjapue2yEViGXu/ms+xWEBV4pLo/4Ewnh07wAm7G+I/U0mQU bKZwN64j9aNouGRunUxzBkUUI/XwRsyPeo1Diq5XZ6L+LeLLaOjTBLGHl9tEHqK8oVIirM 4Kgl54PlrDQn4iabi4QyCTAMyIMxLhcGVPdRTsxaZ+qlQRODVeDS0gO4q3T0ZFBbSuH8FA f1wXhKbnKtut1sqidt9RBGUG6XswZ8FRdXwgSs5MR2CQUBbP6L+/6NVg8Y9ewg== 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=1698069600; 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=Es0lFyOUefH8zhVwmRRcZXEO1N8jxb4APzSsZ+xZAtk=; b=SIYQyEPRJNyOYjIwXkACwUGpH9TpPfje6YdlL//LK02WLyiEHu8JtK3z36vz0X0U2+nQXM gW34f55YRwgugfeiJ/VFu8bjYRwraX1M5C+KDPHf+5N7FdSH3xti1ljypeZfyKw0ZO0y4q xuDejK6tgMEfSb6zEq8lgpzRLPI1ugAs8E1ApoZg5EnTF1sZhprI1wZacq3U83ep4OiKmx 1z6H7aMXGUC10mf3kHR0zVOObFTFfdgRghPmX9oxw5YZ/IjG9JDie8PY6Y4vwDdnRN0Qk1 sWr75jQCu3YvpJN3A+QVw3IgcY0v6ixaRrgPOQm+PfMuvIKDC6IK7ZCAiJA+zg== 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 4SDcJc1CsZzjB6; Mon, 23 Oct 2023 14:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NE00FI012199; Mon, 23 Oct 2023 14:00:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NE00x2012137; Mon, 23 Oct 2023 14:00:00 GMT (envelope-from git) Date: Mon, 23 Oct 2023 14:00:00 GMT Message-Id: <202310231400.39NE00x2012137@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: 0f8b2ba6c629 - main - bsdconfig: Revert bsddialog support 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: 0f8b2ba6c629237e4ddd7a72f7c22f687208060d Auto-Submitted: auto-generated 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. --- 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" \