[src/netbsd-9]: src/distrib/vax/inst-common Pull up following revision(s) (re...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fe7f0ded94d8
branches:  netbsd-9
changeset: 369765:fe7f0ded94d8
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Aug 30 18:35:18 2022 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1514):

        distrib/atari/floppies/common/dot.profile: revision 1.9
        distrib/vax/inst-common/dot.commonutils: revision 1.6
        distrib/amiga/miniroot/dot.profile: revision 1.11
        distrib/utils/script-installer/dot.commonutils: revision 1.8
        distrib/amiga/floppies/inst-common/dot.commonutils: revision 1.9

Fix yet another "[: SMALL test, no fallback usage" error on installation.

The same problem as PR/54835 of the miniroot scripts, i.e.
avoid and replace use of -o binary primary marked obsolescent
by POSIX.1-2017:
 https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html#tag_20_12
8_16

Noticed on installation of NetBSD 9.3 on TT030, and
maybe should be pulled up to netbsd-9.

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

See PR/54835 and PR/56983 for details.

diffstat:

 distrib/amiga/floppies/inst-common/dot.commonutils |  6 +++---
 distrib/amiga/miniroot/dot.profile                 |  4 ++--
 distrib/atari/floppies/common/dot.profile          |  4 ++--
 distrib/utils/script-installer/dot.commonutils     |  6 +++---
 distrib/vax/inst-common/dot.commonutils            |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diffs (117 lines):

diff -r bec86ff6c3c5 -r fe7f0ded94d8 distrib/amiga/floppies/inst-common/dot.commonutils
--- a/distrib/amiga/floppies/inst-common/dot.commonutils        Tue Aug 30 18:31:49 2022 +0000
+++ b/distrib/amiga/floppies/inst-common/dot.commonutils        Tue Aug 30 18:35:18 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.commonutils,v 1.8 2003/07/26 17:06:29 salo Exp $
+# $NetBSD: dot.commonutils,v 1.8.102.1 2022/08/30 18:35:19 martin Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -49,7 +49,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="$dest_dir"usr/distrib
        fi
 
@@ -78,7 +78,7 @@
 {
        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
diff -r bec86ff6c3c5 -r fe7f0ded94d8 distrib/amiga/miniroot/dot.profile
--- a/distrib/amiga/miniroot/dot.profile        Tue Aug 30 18:31:49 2022 +0000
+++ b/distrib/amiga/miniroot/dot.profile        Tue Aug 30 18:35:18 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.10 2008/07/27 19:55:19 mlelstv Exp $
+# $NetBSD: dot.profile,v 1.10.64.1 2022/08/30 18:35:19 martin Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -71,7 +71,7 @@
                # 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
diff -r bec86ff6c3c5 -r fe7f0ded94d8 distrib/atari/floppies/common/dot.profile
--- a/distrib/atari/floppies/common/dot.profile Tue Aug 30 18:31:49 2022 +0000
+++ b/distrib/atari/floppies/common/dot.profile Tue Aug 30 18:35:18 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.7.6.1 2020/01/28 10:20:28 msaitoh Exp $
+# $NetBSD: dot.profile,v 1.7.6.2 2022/08/30 18:35:18 martin Exp $
 #
 # Copyright (c) 1995 Jason R. Thorpe
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -95,7 +95,7 @@
                # 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
diff -r bec86ff6c3c5 -r fe7f0ded94d8 distrib/utils/script-installer/dot.commonutils
--- a/distrib/utils/script-installer/dot.commonutils    Tue Aug 30 18:31:49 2022 +0000
+++ b/distrib/utils/script-installer/dot.commonutils    Tue Aug 30 18:35:18 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.commonutils,v 1.7 2003/07/26 17:07:37 salo Exp $
+# $NetBSD: dot.commonutils,v 1.7.102.1 2022/08/30 18:35:19 martin Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -49,7 +49,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="$dest_dir"usr/distrib
        fi
 
@@ -81,7 +81,7 @@
 #      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
diff -r bec86ff6c3c5 -r fe7f0ded94d8 distrib/vax/inst-common/dot.commonutils
--- a/distrib/vax/inst-common/dot.commonutils   Tue Aug 30 18:31:49 2022 +0000
+++ b/distrib/vax/inst-common/dot.commonutils   Tue Aug 30 18:35:18 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.commonutils,v 1.5 2003/07/26 17:07:41 salo Exp $
+# $NetBSD: dot.commonutils,v 1.5.102.1 2022/08/30 18:35:19 martin 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 @@
 {
        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