From: W. Trevor King <wking@tremily.us>
Date: Fri, 1 Mar 2013 05:57:39 +0000 (-0500)
Subject: kmerge.sh: Fix line wrapping typo from 9ceebbf
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8270d576d3436c662743c6a5b04cd2637265440b;p=catalyst.git

kmerge.sh: Fix line wrapping typo from 9ceebbf

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>
---

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 43d57a6a..f5e1aa88 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -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 ]