kmerge.sh: Fix line wrapping typo from 9ceebbf
authorW. Trevor King <wking@tremily.us>
Fri, 1 Mar 2013 05:57:39 +0000 (00:57 -0500)
committerMatt Turner <mattst88@gmail.com>
Fri, 1 Mar 2013 06:06:18 +0000 (22:06 -0800)
In 9ceebbf (kmerge.sh: Make /var/tmp/${clst_kname}.config optional,
2013-02-09), I added a KERNCACHE check to a `[` test, wrapping the two
clauses in the test to avoid a very long line.  Unfortunately,
newlines do not appear to be legal in this position.  For example:

  $ if [ -n "a" -a
  > -n "b" ]; then echo "c"; fi
  bash: [: missing `]'
  bash: -n: command not found

This commit fixes the error by explicitly wrapping the line with a
backslash.

Reviewed-by: Matt Turner <mattst88@gmail.com>
targets/support/kmerge.sh

index ce1dddffd6c29e3ead1122caaf35976f6ea6c8ef..e78e0b494e4d5db8a8dd765915e46c5fa157eaab 100644 (file)
@@ -180,7 +180,7 @@ then
 fi
 
 CONFIG_MATCH=0
-if [ -n "${clst_KERNCACHE}" -a
+if [ -n "${clst_KERNCACHE}" -a \
      -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
 then
        if [ ! -e /var/tmp/${clst_kname}.config ]