Module Name: src
Committed By: tsutsui
Date: Sun Aug 28 12:44:01 UTC 2022
Modified Files:
src/distrib/amiga/floppies/inst-common: dot.commonutils
src/distrib/amiga/miniroot: dot.profile
src/distrib/utils/script-installer: dot.commonutils
src/distrib/vax/inst-common: dot.commonutils
Log Message:
Avoid more obsolescent binary primaries not supported by crunched test(1).
See PR/54835 and PR/56983 for details.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/distrib/amiga/floppies/inst-common/dot.commonutils
cvs rdiff -u -r1.10 -r1.11 src/distrib/amiga/miniroot/dot.profile
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/script-installer/dot.commonutils
cvs rdiff -u -r1.5 -r1.6 src/distrib/vax/inst-common/dot.commonutils
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amiga/floppies/inst-common/dot.commonutils
diff -u src/distrib/amiga/floppies/inst-common/dot.commonutils:1.8 src/distrib/amiga/floppies/inst-common/dot.commonutils:1.9
--- src/distrib/amiga/floppies/inst-common/dot.commonutils:1.8 Sat Jul 26 17:06:29 2003
+++ src/distrib/amiga/floppies/inst-common/dot.commonutils Sun Aug 28 12:44:00 2022
@@ -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
Index: src/distrib/amiga/miniroot/dot.profile
diff -u src/distrib/amiga/miniroot/dot.profile:1.10 src/distrib/amiga/miniroot/dot.profile:1.11
--- src/distrib/amiga/miniroot/dot.profile:1.10 Sun Jul 27 19:55:19 2008
+++ src/distrib/amiga/miniroot/dot.profile Sun Aug 28 12:44:01 2022
@@ -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
Index: src/distrib/utils/script-installer/dot.commonutils
diff -u src/distrib/utils/script-installer/dot.commonutils:1.7 src/distrib/utils/script-installer/dot.commonutils:1.8
--- src/distrib/utils/script-installer/dot.commonutils:1.7 Sat Jul 26 17:07:37 2003
+++ src/distrib/utils/script-installer/dot.commonutils Sun Aug 28 12:44:01 2022
@@ -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
Index: src/distrib/vax/inst-common/dot.commonutils
diff -u src/distrib/vax/inst-common/dot.commonutils:1.5 src/distrib/vax/inst-common/dot.commonutils:1.6
--- src/distrib/vax/inst-common/dot.commonutils:1.5 Sat Jul 26 17:07:41 2003
+++ src/distrib/vax/inst-common/dot.commonutils Sun Aug 28 12:44:01 2022
@@ -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
