[src/trunk]: src/distrib/miniroot Remove uses of test ... -a ... and test ......

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

details:   https://anonhg.NetBSD.org/src/rev/277ea7e94284
branches:  trunk
changeset: 433490:277ea7e94284
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Sep 16 21:32:29 2018 +0000

description:
Remove uses of test ... -a ... and test ... -o ...

diffstat:

 distrib/miniroot/install.sh |  4 ++--
 distrib/miniroot/upgrade.sh |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 86e230b06305 -r 277ea7e94284 distrib/miniroot/install.sh
--- a/distrib/miniroot/install.sh       Sun Sep 16 20:40:20 2018 +0000
+++ b/distrib/miniroot/install.sh       Sun Sep 16 21:32:29 2018 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: install.sh,v 1.25 2009/09/20 22:44:06 abs Exp $
+#      $NetBSD: install.sh,v 1.26 2018/09/16 21:32:29 kre Exp $
 #
 # Copyright (c) 1996,1997,1999,2000,2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -377,7 +377,7 @@
 
 mount | while read line; do
        set -- $line
-       if [ "$2" = "/" -a "$3" = "nfs" ]; then
+       if [ "$2" = "/" ] && [ "$3" = "nfs" ]; then
                echo "You appear to be running diskless."
                echo -n "Are the install sets on one of your currently mounted filesystems? [n] "
                getresp "n"
diff -r 86e230b06305 -r 277ea7e94284 distrib/miniroot/upgrade.sh
--- a/distrib/miniroot/upgrade.sh       Sun Sep 16 20:40:20 2018 +0000
+++ b/distrib/miniroot/upgrade.sh       Sun Sep 16 21:32:29 2018 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: upgrade.sh,v 1.22 2008/04/30 13:10:48 martin Exp $
+#      $NetBSD: upgrade.sh,v 1.23 2018/09/16 21:32:29 kre Exp $
 #
 # Copyright (c) 1996-2000,2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -238,8 +238,8 @@
 (
        > /tmp/fstab
        while read _dev _mp _fstype _rest ; do
-               if [ "X${_fstype}" = X"ufs" -o \
-                    "X${_fstype}" = X"ffs" ]; then
+               if [ "X${_fstype}" = X"ufs" ] ||
+                  [ "X${_fstype}" = X"ffs" ]; then
                        if [ "X${_fstype}" = X"ufs" ]; then
                                # Convert ufs to ffs.
                                _fstype=ffs