Date: Thu, 14 Jul 2022 01:06:56 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: "Alfonso S. Siciliano" <asiciliano@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 0e5c72c3cc54 - main - bsdinstall time: Replace dialog with bsddialog Message-ID: <4663E594-C2B2-4496-9BAF-1AD2F6707D50@freebsd.org> In-Reply-To: <202203231557.22NFv7Ro095912@gitrepo.freebsd.org> References: <202203231557.22NFv7Ro095912@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 23 Mar 2022, at 15:57, Alfonso S. Siciliano <asiciliano@FreeBSD.org> = wrote: >=20 > The branch main has been updated by asiciliano: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D0e5c72c3cc5471dfa8cb42b018d623b1= ef15dbe8 >=20 > commit 0e5c72c3cc5471dfa8cb42b018d623b1ef15dbe8 > Author: Alfonso S. Siciliano <asiciliano@FreeBSD.org> > AuthorDate: 2022-03-23 15:52:39 +0000 > Commit: Alfonso S. Siciliano <asiciliano@FreeBSD.org> > CommitDate: 2022-03-23 15:56:37 +0000 >=20 > bsdinstall time: Replace dialog with bsddialog >=20 > Replace (LGPL) dialog utility with (BSD-2-Clause) bsddialog = utility, > 'dialog --calendar' is replaced by 'bsddialog --datebox' with same > features but different User Interface. >=20 > Approved by: bapt (mentor) > Differential Revision: https://reviews.freebsd.org/D34583 > --- > usr.sbin/bsdinstall/scripts/time | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) >=20 > diff --git a/usr.sbin/bsdinstall/scripts/time = b/usr.sbin/bsdinstall/scripts/time > index cccd5999a035..5db4b48f7531 100755 > --- a/usr.sbin/bsdinstall/scripts/time > +++ b/usr.sbin/bsdinstall/scripts/time > @@ -36,23 +36,23 @@ export TZ >=20 > # Set date > exec 3>&1 > -DATE=3D$(dialog --backtitle 'FreeBSD Installer' \ > - --title 'Time & Date' \ > +DATE=3D$(bsddialog --backtitle 'FreeBSD Installer' \ > + --title ' Date ' \ > --ok-label 'Set Date' \ > --cancel-label 'Skip' \ > - --defaultno \ > + --default-no \ > --date-format '%Y%m%d%H%M.%S' \ > - --calendar '' 0 40 \ > + --datebox '' 0 40 \ > 2>&1 1>&3) && date $DATE > exec 3>&- >=20 > # Set time > exec 3>&1 > -TIME=3D$(dialog --backtitle 'FreeBSD Installer' \ > - --title 'Time & Date' \ > +TIME=3D$(bsddialog --backtitle 'FreeBSD Installer' \ > + --title ' Time ' \ > --ok-label 'Set Time' \ > --cancel-label 'Skip' \ > - --defaultno \ > + --default-no \ > --time-format '%H%M.%S' \ > --timebox '' 0 40 \ > 2>&1 1>&3) && date $TIME Something I missed until trying out an image post this commit: bsddialog=E2=80=99s --timebox implementation does not zero-pad the = numbers, so you end up with nonsense like 1:2:3 rather than 01:02:03 (or 1:02:03, but 01:02:03 generally looks better). Having the date displayed as YYYY/monthname/DD for --datebox is also a bit strange, but I can see reasons for doing that I guess. Jess
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4663E594-C2B2-4496-9BAF-1AD2F6707D50>