Avoid more obsolescent binary primaries not supported by crunched test(1).

See PR/54835 and PR/56983 for details.
This commit is contained in:
tsutsui 2022-08-28 12:44:00 +00:00
parent 320fd9e660
commit 6baa9127b6
4 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: dot.commonutils,v 1.8 2003/07/26 17:06:29 salo Exp $
# $NetBSD: dot.commonutils,v 1.9 2022/08/28 12:44:00 tsutsui Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@ -49,7 +49,7 @@ GUNZIP=/usr/bin/gunzip
Set_tmp_dir()
{
def_tmp_dir=`pwd`
if [ "$def_tmp_dir" = "/" -o "$def_tmp_dir" = "/mnt" ]; then
if [ "$def_tmp_dir" = "/" ] || [ "$def_tmp_dir" = "/mnt" ]; then
def_tmp_dir="$dest_dir"usr/distrib
fi
@ -78,7 +78,7 @@ Load_fd()
{
Tmp_dir
which=
while [ "$which" != "a" -a "$which" != "b" ]; do
while [ "$which" != "a" ] && [ "$which" != "b" ]; do
echo -n "Read from which floppy drive ('a' or 'b')? [a] "
read which
if [ "X$which" = "X" ]; then

View File

@ -1,4 +1,4 @@
# $NetBSD: dot.profile,v 1.10 2008/07/27 19:55:19 mlelstv Exp $
# $NetBSD: dot.profile,v 1.11 2022/08/28 12:44:01 tsutsui Exp $
#
# Copyright (c) 1995 Jason R. Thorpe
# Copyright (c) 1994 Christopher G. Demetriou
@ -71,7 +71,7 @@ if [ "X${DONEPROFILE}" = "X" ]; then
# Check if the answer is valid (in range). Note that an answer
# < 0 cannot happen because the sed(1) above also removes the
# sign.
if [ -z "$_ans" -o "$_ans" -ge $_num ]; then
if [ -z "$_ans" ] || [ "$_ans" -ge $_num ]; then
echo "You entered an invalid response, please try again."
continue
fi

View File

@ -1,4 +1,4 @@
# $NetBSD: dot.commonutils,v 1.7 2003/07/26 17:07:37 salo Exp $
# $NetBSD: dot.commonutils,v 1.8 2022/08/28 12:44:01 tsutsui Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@ -49,7 +49,7 @@ GUNZIP=/usr/bin/gunzip
Set_tmp_dir()
{
def_tmp_dir=`pwd`
if [ "$def_tmp_dir" = "/" -o "$def_tmp_dir" = "/mnt" ]; then
if [ "$def_tmp_dir" = "/" ] || [ "$def_tmp_dir" = "/mnt" ]; then
def_tmp_dir="$dest_dir"usr/distrib
fi
@ -81,7 +81,7 @@ Load_fd()
# echo "Don't forget that you can't load from the drive you booted from."
echo ""
while [ "$which" != "0" -a "$which" != "1" ]; do
while [ "$which" != "0" ] && [ "$which" != "1" ]; do
echo -n "Read from which floppy drive ('0' or '1')? [0] "
read which
if [ "X$which" = "X" ]; then

View File

@ -1,4 +1,4 @@
# $NetBSD: dot.commonutils,v 1.5 2003/07/26 17:07:41 salo Exp $
# $NetBSD: dot.commonutils,v 1.6 2022/08/28 12:44:01 tsutsui Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@ -39,7 +39,7 @@
Set_tmp_dir()
{
def_tmp_dir=`pwd`
if [ "$def_tmp_dir" = "/" -o "$def_tmp_dir" = "/mnt" ]; then
if [ "$def_tmp_dir" = "/" ] || [ "$def_tmp_dir" = "/mnt" ]; then
def_tmp_dir=/mnt/usr/distrib
fi
@ -68,7 +68,7 @@ Load_fd()
{
Tmp_dir
which=
while [ "$which" != "a" -a "$which" != "b" ]; do
while [ "$which" != "a" ] && [ "$which" != "b" ]; do
echo -n "Read from which floppy drive ('a' or 'b')? [a] "
read which
if [ "X$which" = "X" ]; then