From nobody Wed Mar 16 00:49:30 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 B41701A14DBA; Wed, 16 Mar 2022 00:49: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 4KJBVy4hPbz4qSL; Wed, 16 Mar 2022 00:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647391770; 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=oDLE3/g/26cb8Omn7qwB2PzD5JDKLBKhUYS5h5+PT5Y=; b=lIn+ID0wZf1z8TFrOUdNmlDOYnrT4/6g84X0u8dWxWYOd/spdzyZ9I/jPXtKLiBe7Dk+va 7ua0wEyIhtvNrg3Sh1VgpatoAclUyYb7bKcVCxQ6dVM/kdQ2xUEHBSAyKPtsYMX+Jf/Ez5 clsh19GP6lEndiCzxprz4Jlt92PK+PfXRuKOLN9Gup8Zr7pDd9hPH4o6mM1MZawG5pXoMb kiz8lkXwYGBi0+0PRycaOkuJ++UGnPSE4G5jqgw+op/YJ7w66r0jOnfxuoQfPLVXOxLZlz bWxKU5e2gfiZ3Dj4gg/uWWPOFFRNbXKjGvXBITSOQ1WWjAYGUjCylgeqehVOfA== 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 80B254638; Wed, 16 Mar 2022 00:49: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 22G0nUcn002117; Wed, 16 Mar 2022 00:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22G0nU5t002116; Wed, 16 Mar 2022 00:49:30 GMT (envelope-from git) Date: Wed, 16 Mar 2022 00:49:30 GMT Message-Id: <202203160049.22G0nU5t002116@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: 8cdecdecb431 - main - spkrtest(8): 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: 8cdecdecb4319a9fe23afa2ac4e167fe454ebaf1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647391770; 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=oDLE3/g/26cb8Omn7qwB2PzD5JDKLBKhUYS5h5+PT5Y=; b=HKjuf9+xujQRF/+g06toHt47O8LriHyTuwqL0OAZeyWWTWXnfFYOBa1arKmR2IxMnOm7xU 0hv8cicPZUoq6jZdnNY64yJ3VOooRjBGmsri3xfx/g3imTs9Eko0Xru0ruu8VWEh72caDf 5OFOsetlPrBV2KlP2txm1Ab9DQAvmQ0ENbV+ZelP8qeVtGG8Z/N1MoTRLC5J3tOUIbSgAa P5YVtb5NH72qxyghv4J297EsrVkBzrwcPMfU4srmg0aArg7gndo4jP8+LGq7a+VxUl9hVl 6Rudd7d8KOnePxL/ZtCVJ2RiPDg0zSPWWpCtPtzYZ2n9lSYaYpCl9G+YtyPWPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647391770; a=rsa-sha256; cv=none; b=a9t3dmCvfvhloBCFa+6uVfR38PNI+2lyos76IhBTD03jlO4i/8ce+fffAgErwucPrmKDx/ 9dq5kZwTXPYiyCecB9gh0j5Qb6MZs/n31U4hkUKA8uLk092bkqAYNVeUr2M4DrbuhblAKg 02SQJYxxuuHAWZU/sJWdjq5ZcY+D9s0c1Bb1WPNZGqHCSsw66MIBZfPIvPZEK1aKynBa2y t0DnIeR5Cs+r8HRdIqHvm/W7namnv0m2gdzgQ4moTJ7bRRiMMreQ1zwvji6Wxm1goTdaru oJchOdsRU9T0pHD2bipkA3a3hdjjcSWKjBB9A6xfdmYGUsFKWqVUwPHTBbhrLg== 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=8cdecdecb4319a9fe23afa2ac4e167fe454ebaf1 commit 8cdecdecb4319a9fe23afa2ac4e167fe454ebaf1 Author: Alfonso S. Siciliano AuthorDate: 2022-03-16 00:47:49 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-03-16 00:48:53 +0000 spkrtest(8): Replace dialog with bsddialog Replace (LGPL) dialog with (BSD-2-Clause) bsddialog and update manual. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D34459 --- usr.sbin/spkrtest/spkrtest.8 | 8 ++++++-- usr.sbin/spkrtest/spkrtest.sh | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/usr.sbin/spkrtest/spkrtest.8 b/usr.sbin/spkrtest/spkrtest.8 index 58eced5be0de..a7266c7e7be1 100644 --- a/usr.sbin/spkrtest/spkrtest.8 +++ b/usr.sbin/spkrtest/spkrtest.8 @@ -23,12 +23,14 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd July 23, 1995 +.Dd March 6, 2022 .Dt SPKRTEST 8 .Os .Sh NAME .Nm spkrtest .Nd test script for the speaker driver +.Sh SYNOPSIS +.Nm .Sh DESCRIPTION The .Nm @@ -38,8 +40,10 @@ utility is an easy to use test script for the speaker driver. .It Pa /dev/speaker speaker device file .El +.Sh EXIT STATUS +.Ex -std .Sh SEE ALSO -.Xr dialog 1 , +.Xr bsddialog 1 , .Xr spkr 4 .Sh HISTORY The diff --git a/usr.sbin/spkrtest/spkrtest.sh b/usr.sbin/spkrtest/spkrtest.sh index 4acfb6750015..417d38350233 100644 --- a/usr.sbin/spkrtest/spkrtest.sh +++ b/usr.sbin/spkrtest/spkrtest.sh @@ -53,21 +53,21 @@ then cleanExit 1 fi -/usr/bin/dialog --title "Speaker test" --checklist \ +/usr/bin/bsddialog --title " Speaker test " --checklist \ "Please select the melodies you wish to play (space for select)" \ 0 0 0 \ - reveille "Reveille" OFF \ - contact "Contact theme from Close Encounters" OFF \ - dance "Lord of the Dance (aka Simple Gifts)" OFF \ - loony "Loony Toons theme" OFF \ - sinister "Standard villain's entrance music" OFF \ - rightstuff "A trope from 'The Right Stuff' score by Bill Conti" OFF \ - toccata "Opening bars of Bach's Toccata and Fugue in D Minor" OFF \ - startrek "Opening bars of the theme from Star Trek Classic" OFF \ + reveille "Reveille" off \ + contact "Contact theme from Close Encounters" off \ + dance "Lord of the Dance (aka Simple Gifts)" off \ + loony "Loony Toons theme" off \ + sinister "Standard villain's entrance music" off \ + rightstuff "A trope from 'The Right Stuff' score by Bill Conti" off \ + toccata "Opening bars of Bach's Toccata and Fugue in D Minor" off \ + startrek "Opening bars of the theme from Star Trek Classic" off \ 2> ${choices} || cleanExit 0 echo "" -tunes="`cat ${choices} | tr -d '\"'`" +tunes="`cat ${choices}`" for tune in ${tunes:-DEFAULT} do case ${tune:-NULL} in