Module Name: src
Committed By: kre
Date: Sun Sep 16 22:37:24 UTC 2018
Modified Files:
src/sbin/newbtconf: newbtconf.sh
Log Message:
Remove uses of test -o
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/newbtconf/newbtconf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newbtconf/newbtconf.sh
diff -u src/sbin/newbtconf/newbtconf.sh:1.8 src/sbin/newbtconf/newbtconf.sh:1.9
--- src/sbin/newbtconf/newbtconf.sh:1.8 Mon Jan 5 23:23:33 2004
+++ src/sbin/newbtconf/newbtconf.sh Sun Sep 16 22:37:24 2018
@@ -15,7 +15,7 @@ FILES="defaultdomain fstab ifconfig.* in
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 @@ if [ $dir = init ] ; then
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 @@ if [ $dir = revert ] ; then
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*) :;;
