From f736d34cc9cb4be91d0b59b98141915abe5764ad Mon Sep 17 00:00:00 2001 From: Kiyoshi Aman Date: Sat, 6 Jul 2019 04:39:14 -0500 Subject: {usr.bin => bin}/{true,false}: put true/false where they belong --- Makefile | 4 ++-- bin/false/false.1 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ bin/false/false.sh | 2 ++ bin/true/true.1 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ bin/true/true.sh | 2 ++ usr.bin/false/false.1 | 56 -------------------------------------------------- usr.bin/false/false.sh | 2 -- usr.bin/true/true.1 | 56 -------------------------------------------------- usr.bin/true/true.sh | 2 -- 9 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 bin/false/false.1 create mode 100644 bin/false/false.sh create mode 100644 bin/true/true.1 create mode 100644 bin/true/true.sh delete mode 100644 usr.bin/false/false.1 delete mode 100644 usr.bin/false/false.sh delete mode 100644 usr.bin/true/true.1 delete mode 100644 usr.bin/true/true.sh diff --git a/Makefile b/Makefile index 1d58eaf..d481a3d 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ clean: install: all gprinstall -P $(PROJECT) -p --prefix=$(if $(DESTDIR),$(DESTDIR),/) - $(INSTALL) -Dm0755 usr.bin/false/false.sh $(DESTDIR)/usr/bin/false - $(INSTALL) -Dm0755 usr.bin/true/true.sh $(DESTDIR)/usr/bin/true + $(INSTALL) -Dm0755 bin/false/false.sh $(DESTDIR)/bin/false + $(INSTALL) -Dm0755 bin/true/true.sh $(DESTDIR)/bin/true prepare: $(GENERATED) diff --git a/bin/false/false.1 b/bin/false/false.1 new file mode 100644 index 0000000..175b67a --- /dev/null +++ b/bin/false/false.1 @@ -0,0 +1,56 @@ +.\" $NetBSD: false.1,v 1.8 2003/08/07 11:13:40 agc Exp $ +.\" +.\" Copyright (c) 1983, 1990 The Regents of the University of California. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to Berkeley by +.\" the Institute of Electrical and Electronics Engineers, Inc. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" from: @(#)false.1 6.6 (Berkeley) 7/24/91 +.\" $NetBSD: false.1,v 1.8 2003/08/07 11:13:40 agc Exp $ +.\" +.Dd July 24, 1991 +.Dt FALSE 1 +.Os +.Sh NAME +.Nm false +.Nd return false value +.Sh SYNOPSIS +.Nm +.Sh DESCRIPTION +The +.Nm +utility always exits with a nonzero exit code. +.Sh SEE ALSO +.Xr csh 1 , +.Xr sh 1 , +.Xr true 1 +.Sh STANDARDS +The +.Nm +utility conforms to +.St -p1003.2-92 . diff --git a/bin/false/false.sh b/bin/false/false.sh new file mode 100644 index 0000000..2526efb --- /dev/null +++ b/bin/false/false.sh @@ -0,0 +1,2 @@ +#! /bin/sh +exit 1 diff --git a/bin/true/true.1 b/bin/true/true.1 new file mode 100644 index 0000000..5829560 --- /dev/null +++ b/bin/true/true.1 @@ -0,0 +1,56 @@ +.\" $NetBSD: true.1,v 1.7 2003/08/07 11:16:48 agc Exp $ +.\" +.\" Copyright (c) 1983, 1985, 1990 The Regents of the University of California. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to Berkeley by +.\" the Institute of Electrical and Electronics Engineers, Inc. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" from: @(#)true.1 6.4 (Berkeley) 6/27/91 +.\" $NetBSD: true.1,v 1.7 2003/08/07 11:16:48 agc Exp $ +.\" +.Dd June 27, 1991 +.Dt TRUE 1 +.Os +.Sh NAME +.Nm true +.Nd return true value +.Sh SYNOPSIS +.Nm +.Sh DESCRIPTION +The +.Nm +utility always returns with exit code zero. +.Sh SEE ALSO +.Xr csh 1 , +.Xr false 1 , +.Xr sh 1 +.Sh STANDARDS +The +.Nm +utility conforms to +.St -p1003.2-92 . diff --git a/bin/true/true.sh b/bin/true/true.sh new file mode 100644 index 0000000..20f87ef --- /dev/null +++ b/bin/true/true.sh @@ -0,0 +1,2 @@ +#! /bin/sh +exit 0 diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1 deleted file mode 100644 index 175b67a..0000000 --- a/usr.bin/false/false.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" $NetBSD: false.1,v 1.8 2003/08/07 11:13:40 agc Exp $ -.\" -.\" Copyright (c) 1983, 1990 The Regents of the University of California. -.\" All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" the Institute of Electrical and Electronics Engineers, Inc. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" from: @(#)false.1 6.6 (Berkeley) 7/24/91 -.\" $NetBSD: false.1,v 1.8 2003/08/07 11:13:40 agc Exp $ -.\" -.Dd July 24, 1991 -.Dt FALSE 1 -.Os -.Sh NAME -.Nm false -.Nd return false value -.Sh SYNOPSIS -.Nm -.Sh DESCRIPTION -The -.Nm -utility always exits with a nonzero exit code. -.Sh SEE ALSO -.Xr csh 1 , -.Xr sh 1 , -.Xr true 1 -.Sh STANDARDS -The -.Nm -utility conforms to -.St -p1003.2-92 . diff --git a/usr.bin/false/false.sh b/usr.bin/false/false.sh deleted file mode 100644 index 2526efb..0000000 --- a/usr.bin/false/false.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -exit 1 diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1 deleted file mode 100644 index 5829560..0000000 --- a/usr.bin/true/true.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" $NetBSD: true.1,v 1.7 2003/08/07 11:16:48 agc Exp $ -.\" -.\" Copyright (c) 1983, 1985, 1990 The Regents of the University of California. -.\" All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" the Institute of Electrical and Electronics Engineers, Inc. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" from: @(#)true.1 6.4 (Berkeley) 6/27/91 -.\" $NetBSD: true.1,v 1.7 2003/08/07 11:16:48 agc Exp $ -.\" -.Dd June 27, 1991 -.Dt TRUE 1 -.Os -.Sh NAME -.Nm true -.Nd return true value -.Sh SYNOPSIS -.Nm -.Sh DESCRIPTION -The -.Nm -utility always returns with exit code zero. -.Sh SEE ALSO -.Xr csh 1 , -.Xr false 1 , -.Xr sh 1 -.Sh STANDARDS -The -.Nm -utility conforms to -.St -p1003.2-92 . diff --git a/usr.bin/true/true.sh b/usr.bin/true/true.sh deleted file mode 100644 index 20f87ef..0000000 --- a/usr.bin/true/true.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -exit 0 -- cgit v1.2.3-70-g09d2