From nobody Sat Mar 26 00:16:29 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 27F7C1A3128F; Sat, 26 Mar 2022 00:16: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 4KQKJG0cgJz3n7R; Sat, 26 Mar 2022 00:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648253790; 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=o/91191uxi6JGypzcOqTvAUJ8lPBceQpqhVTNAUIVXM=; b=nhd0f7mMid835xAVDh+AiG5fCMU6vtPs5z2HboTe4yLOaVosDi3t0DfCYfU7jfH89FB5ZW S6K28vBIY26kPJuPULcidhm5g5vINoUImaC62vH9P/uLnFybKyV/yKu5lxTllfKhL2D/jU rA4/VQUqCMWHPsqXh4JTZVfXpaeg7XXSAAImx+B2QOTf++NIUnleVswxnxLiwuMDYkHYFf DoeZ4exdzA7NRiZTpfFUc+DC0sjUB3xcjUklwAslYBjQKtXqa5YqEL5BAsT5Gp9gkSbjV4 mnYnoAB3ECD3XsnoLis3nqFXGUnqna7IlLtslVIL1yb9xa1Lo0sN+deUVNAP9Q== 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 E9A2D16C20; Sat, 26 Mar 2022 00:16:29 +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 22Q0GTOu084012; Sat, 26 Mar 2022 00:16:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22Q0GTLr084011; Sat, 26 Mar 2022 00:16:29 GMT (envelope-from git) Date: Sat, 26 Mar 2022 00:16:29 GMT Message-Id: <202203260016.22Q0GTLr084011@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: bbddd8888aa9 - main - bsdinstall mirrorselect: 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: bbddd8888aa9119746d3af3af98800b359ab3b40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648253790; 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=o/91191uxi6JGypzcOqTvAUJ8lPBceQpqhVTNAUIVXM=; b=LrBOKbA3G3p4Byd5F3sIIWr6Zur9GeB4mL7LmdaVuUsiqfs3HwU5/m/at25gP5h+7nIpm2 WqKlNp8vNV9/bG44Ae36KwB2CC/sAPeekk21vn5fhgVWUn76nkqkBva7RRHNY8hsNjn8jp Vlz6SaB2cm25O594x1ui7caksikwxfUpKT15hBbdea9402N9NT1pw7YMN786GdZhU/JKuX 93DtKLDq9WG7Kcd0qjp3eGULlWImeHnd072xt0nWGqaEGWsUfGYbrKEdi5hrDwCKZGNQr6 KnGqu1bYxGAOOTQjA+ONAgy2a3tDBJijvjGwA/SEDlhnhGT9M6B3R1BxrS8LHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648253790; a=rsa-sha256; cv=none; b=F3KL7ptbL9gLdRLM+Hb9C1ZRhOqFgINFxn5PCL16byGh9YoVSui86eZeeTZw0HGWMkzT5G LTF1NviHBXFrrm4E/n+Efxm4W46KGjmvolJF9IRj8IUkS/YvUuc/jdbd7LdamC9mc3CuzE n03T0z8A2xaLvEcWw/9RaL0T1ynsY7XoV/HCKdl0UzvBlH1peWu4YYoKgXxZZtKtqHR9O0 k4Ydle970AHnWx38VdHFGCN//NsGGV1ykody29KO64VPu7a9QyTho6vVcTsylinveaRSfy una4qbrbw7Xy85YC/jeBwsA9mDNRDmG6+nNTctgAnE/aVfjRNg1cLVCiT88Prg== 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=bbddd8888aa9119746d3af3af98800b359ab3b40 commit bbddd8888aa9119746d3af3af98800b359ab3b40 Author: Alfonso S. Siciliano AuthorDate: 2022-03-26 00:13:59 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-03-26 00:16:03 +0000 bsdinstall mirrorselect: Replace dialog with bsddialog Replace (LGPL) dialog utility with (BSD-2-Clause) bsddialog utility. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D34582 --- usr.sbin/bsdinstall/scripts/mirrorselect | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index e218fe92dbbb..a80b9282cbd0 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -26,18 +26,18 @@ # # $FreeBSD$ -: ${DIALOG_OK=0} -: ${DIALOG_CANCEL=1} -: ${DIALOG_HELP=2} -: ${DIALOG_EXTRA=3} -: ${DIALOG_ITEM_HELP=4} -: ${DIALOG_ESC=255} +: ${BSDDIALOG_OK=0} +: ${BSDDIALOG_CANCEL=1} +: ${BSDDIALOG_HELP=2} +: ${BSDDIALOG_EXTRA=3} +: ${BSDDIALOG_ESC=5} +: ${BSDDIALOG_ERROR=255} exec 3>&1 -MIRROR=`dialog --backtitle "FreeBSD Installer" \ +MIRROR=`bsddialog --backtitle "FreeBSD Installer" \ --title "Mirror Selection" --extra-button --extra-label "Other" \ --menu "Please select the site closest to you or \"other\" if you'd like to specify a different choice. Also note that not every site listed here carries more than the base distribution kits. Only Primary sites are guaranteed to carry the full range of possible distributions. Select a site that's close!" \ - 0 0 0 \ + 0 0 16 \ ftp://ftp.freebsd.org "Main Site"\ ftp://ftp.freebsd.org "IPv6 Main Site"\ ftp://ftp3.ie.freebsd.org "IPv6 Ireland"\ @@ -157,20 +157,20 @@ esac BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}" case $MIRROR_BUTTON in -$DIALOG_CANCEL) +$BSDDIALOG_ERROR | $BSDDIALOG_CANCEL | $BSDDIALOG_ESC) exit 1 ;; -$DIALOG_OK) +$BSDDIALOG_OK) ;; -$DIALOG_EXTRA) +$BSDDIALOG_EXTRA) exec 3>&1 - BSDINSTALL_DISTSITE=`dialog --backtitle "FreeBSD Installer" \ + BSDINSTALL_DISTSITE=`bsddialog --backtitle "FreeBSD Installer" \ --title "Mirror Selection" \ --inputbox "Please enter the URL to an alternate FreeBSD mirror:" \ - 0 0 "$BSDINSTALL_DISTSITE" 2>&1 1>&3` + 0 74 "$BSDINSTALL_DISTSITE" 2>&1 1>&3` MIRROR_BUTTON=$? exec 3>&- - test $MIRROR_BUTTON -eq 0 || exec $0 $@ + test $MIRROR_BUTTON -eq $BSDDIALOG_OK || exec $0 $@ ;; esac