[src/trunk]: src/sbin/newbtconf Remove uses of test -o

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

details:   https://anonhg.NetBSD.org/src/rev/31516c825a79
branches:  trunk
changeset: 993552:31516c825a79
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Sep 16 22:37:24 2018 +0000

description:
Remove uses of test -o

diffstat:

 sbin/newbtconf/newbtconf.sh |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 4befaecc5fd3 -r 31516c825a79 sbin/newbtconf/newbtconf.sh
--- a/sbin/newbtconf/newbtconf.sh       Sun Sep 16 22:31:30 2018 +0000
+++ b/sbin/newbtconf/newbtconf.sh       Sun Sep 16 22:37:24 2018 +0000
@@ -15,7 +15,7 @@
        rc.conf rc.conf.d resolv.conf"
 
 if [ $dir = init ] ; then
-       if [ -d /etc/etc.network -o -e /etc/etc.current ] ; then
+       if [ -d /etc/etc.network ] || [ -e /etc/etc.current ] ; then
                echo "Error: multi-configuration already initialized"
                exit 1
        fi
@@ -25,7 +25,7 @@
        ln -s $dir etc.current
        ln -s $dir etc.default
        for i in ${FILES}; do
-               if [ -f $i -o -d $i ] ; then
+               if [ -f $i ] || [ -d $i ] ; then
                        mv $i $dir
                        ln -s etc.current/$i .
                fi
@@ -41,7 +41,7 @@
        fi
        cd /etc
        for i in ${FILES}; do
-               if [ -f $i -o -d $i ] ; then
+               if [ -f $i ] || [ -d $i ] ; then
                        stat="`ls -ld $i`"
                        case x"$stat" in
                                xl*) :;;