summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2012-08-21 13:46:46 +0000
committerdteske <dteske@FreeBSD.org>2012-08-21 13:46:46 +0000
commitdba327264b592eeaf818773aeb9bc32f3f0dfd98 (patch)
tree2c60ec91619f84f408e2454a82fc0709b6c5ebad /usr.sbin
parent30d5057ff7e365096c74c1e9a76cf9b34930a29d (diff)
downloadFreeBSD-src-dba327264b592eeaf818773aeb9bc32f3f0dfd98.zip
FreeBSD-src-dba327264b592eeaf818773aeb9bc32f3f0dfd98.tar.gz
Fix "unexpected operator" error when passed multi-word first-argument
containing whitespace. Also make other changes to support multi-word arguments. PR: bin/170759 Submitted by: dteske Reviewed by: emaste (mentor) Approved by: emaste (mentor) MFC after: 3 days
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/bsdinstall/bsdinstall7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/bsdinstall/bsdinstall b/usr.sbin/bsdinstall/bsdinstall
index 236dbac..8225daf 100755
--- a/usr.sbin/bsdinstall/bsdinstall
+++ b/usr.sbin/bsdinstall/bsdinstall
@@ -34,11 +34,10 @@
VERB=$1; shift
-if [ -z $VERB ]; then
+if [ -z "$VERB" ]; then
VERB=auto
fi
test -d "$BSDINSTALL_TMPETC" || mkdir "$BSDINSTALL_TMPETC"
-echo Running installation step: $VERB $@ >> "$BSDINSTALL_LOG"
-exec /usr/libexec/bsdinstall/$VERB $@ 2>>"$BSDINSTALL_LOG"
-
+echo "Running installation step: $VERB $@" >> "$BSDINSTALL_LOG"
+exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>>"$BSDINSTALL_LOG"
OpenPOWER on IntegriCloud