[src/trunk]: src/distrib/amiga/floppies/inst Remove uses of test ([) -a opera...

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

details:   https://anonhg.NetBSD.org/src/rev/e5c91f6df844
branches:  trunk
changeset: 835932:e5c91f6df844
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Sep 16 22:22:44 2018 +0000

description:
Remove uses of test ([) -a operator.   More cleanups.

This script looks like it cold do with an agressive cleanup, but
I have no rational way to test it, so it won't get done by me...

diffstat:

 distrib/amiga/floppies/inst/install.sh |  42 ++++++++++++++++++---------------
 1 files changed, 23 insertions(+), 19 deletions(-)

diffs (136 lines):

diff -r cfa84c4689ec -r e5c91f6df844 distrib/amiga/floppies/inst/install.sh
--- a/distrib/amiga/floppies/inst/install.sh    Sun Sep 16 21:49:18 2018 +0000
+++ b/distrib/amiga/floppies/inst/install.sh    Sun Sep 16 22:22:44 2018 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: install.sh,v 1.9 2003/07/26 17:06:28 salo Exp $
+# $NetBSD: install.sh,v 1.10 2018/09/16 22:22:44 kre Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -45,7 +45,7 @@
 
 getresp() {
        read resp
-       if [ "X$resp" = "X" ]; then
+       if [ -z "$resp" ]; then
                resp=$1
        fi
 }
@@ -55,7 +55,7 @@
 }
 
 shiftvar() {
-       local - var
+       local var
        var="$1"
        list="$(getvar $var)"
        set -- $list
@@ -76,7 +76,7 @@
        for du in /dev/r${drivetype}?a; do
                dd if=$du of=/dev/null bs=1b count=1 >/dev/null 2>&1
                if [ $? -eq 0 ]; then
-                       thisunit=`echo $du | sed -e 's,/dev/r\(...\)a,\1,g'`
+                       thisunit=$( echo $du | sed -e 's,/dev/r\(...\)a,\1,g' )
                        driveunits="$driveunits $thisunit"
                else
                        continue;
@@ -136,7 +136,9 @@
 getdrives
 for du in $driveunits; do
        set -- $(getvar $du)
-       if [ $# -ge 2 -a "$1" = "a" -a "`echo $2 | sed -e 's,.*BSD.*,BSD,'`" = "BSD" ]; then
+       if [ $# -ge 2 ] &&
+          [ "$1" = a ] &&
+          [ "$( echo "$2" | sed -e 's,.*BSD.*,BSD,' )" = BSD ]; then
                rdev=$du
        fi
 done
@@ -147,10 +149,10 @@
 echo   ""
 prefdev=${rdev}
 rdev=""
-while [ "X${rdev}" = "X" ]; do
+while [ -z "${rdev}" ]; do
        echo -n "Which device would you like to install on ? [${prefdev}] "
        getresp ${prefdev}
-       otherdrives=`echo "${driveunits}" | sed -e s,${resp},,`
+       otherdrives=$( echo "${driveunits}" | sed -e "s,${resp},," )
        if [ "X${driveunits}" = "X${otherdrives}" ]; then
                echo    ""
                echo    "\"${resp}\" is an invalid drive name. Valid choices"
@@ -163,8 +165,8 @@
 echo   ""
 echo   "The root device you have chosen is on: ${rdev}"
 echo   ""
-# driveunits=`ls /dev/${drivetype}?a | sed -e 's,/dev/\(...\)a,\1,g'`
-if [ "X${driveunits}" = "X" ]; then
+# driveunits=$( ls /dev/${drivetype}?a | sed -e 's,/dev/\(...\)a,\1,g' )
+if [ -z "${driveunits}" ]; then
        echo    "FATAL ERROR:"
        echo    "No devices for disks of type '${drivetype}'."
        echo    "This is probably a bug in the install disks."
@@ -178,9 +180,9 @@
 echo   "(answering yes will format your root partition on $rdev)"
 echo -n        "Are you SURE you want NetBSD installed on your hard drive? (yes/no) "
 answer=""
-while [ "$answer" = "" ]; do
+while [ -z "$answer" ]; do
        getresp
-       case $resp in
+       case "$resp" in
                yes|YES)
                        echo    ""
                        answer=yes
@@ -214,10 +216,10 @@
 echo   "Now lets setup your /usr file system"
 echo   "(Once a valid input for drive and partition is seen"
 echo   "it will be FORMATTED and inserted in the fstab.)"
-while [ "X$usrpart" = "X" ]; do
+while [ -z "$usrpart" ]; do
        resp=""
        drivename=""
-       while [ "X$resp" = "X" ]; do
+       while [ -z "$resp" ]; do
                echo    "choices: $driveunits"
                echo    "which drive do you want /usr on?"
                getresp
@@ -238,11 +240,12 @@
        usrpart=""
        echo    "You have selected $drivename"
        echo    "here is a list of partitions on $drivename"
-       disklabel $drivename 2>/dev/null | sed -e '/^[ ][ ][ad-p]:/p;/^#[ \t]*size/p;d' 
+       disklabel $drivename 2>/dev/null |
+           sed -e '/^[ ][ ][ad-p]:/p;/^#[ \t]*size/p;d' 
        echo    "which partition would you like to format and have"
        echo -n "mounted as /usr? (supply the letter): "
        getresp
-       if [ "X$resp" = "X" ]; then
+       if [ -z "$resp" ]; then
                continue;
        fi
 
@@ -250,10 +253,11 @@
        set -- $list
        while [ $# -gt 0 ]; do
                if [ "$resp" = "$1" ]; then
-                       if [ "`echo $2 | sed -e 's,.*BSD.*,BSD,'`" != "BSD" ]; then
+                       if [ "$( echo $2 | sed -e 's,.*BSD.*,BSD,' )" != "BSD" ]
+                       then
                                echo    ""
-                               echo -n "$drivename$resp is of type $2 which is not"
-                               echo    " a BSD filesystem type"
+                               echo -n "$drivename$resp is of type $2 which"
+                               echo    " is not a BSD filesystem type"
                                break
                        fi
                        usrpart=$drivename$resp
@@ -263,7 +267,7 @@
                        shift
                fi
        done
-       if [ "X$usrpart" = "X" ]; then
+       if [ -z "$usrpart" ]; then
                echo    "$resp is not a valid input."
                echo    ""
        fi