summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-02-05 10:55:18 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-02-09 22:21:48 -0800
commitb2d506d51413f1e819b2abd89baaa920d20f226e (patch)
treecee6b7d49cb97d3ceb2ea292efc70a69415d8813
parent43cdf15f36b6068cc2a7ab73bdc13aa758bf4892 (diff)
build.sh: fix test error message when modules file not supplied
Seems to be harmless, just noisy message: git/util/modular/build.sh[1323]: [: argument expected sh -x shows it was coming from expanding: if [ X"$BUILT_MODULES_FILE" != X -a -r $BUILT_MODULES_FILE ] to: + [ X '!=' X -a -r ] Adding quotes ensures the shell sees an empty argument instead of none. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-rwxr-xr-xbuild.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index a3eaf77..2093644 100755
--- a/build.sh
+++ b/build.sh
@@ -1320,7 +1320,7 @@ fi
# if there is a BUILT_MODULES_FILE
# then start off by checking for and trying to build any modules which failed
# and aren't the last line
-if [ X"$BUILT_MODULES_FILE" != X -a -r $BUILT_MODULES_FILE ]; then
+if [ X"$BUILT_MODULES_FILE" != X -a -r "$BUILT_MODULES_FILE" ]; then
built_lines=`cat $BUILT_MODULES_FILE | wc -l | sed 's:^ *::'`
built_lines_m1=`expr $built_lines - 1`
orig_BUILT_MODULES_FILE=$BUILT_MODULES_FILE