On Thu, Feb 28, 2013 at 9:57 PM, W. Trevor King <[email protected]> wrote: > From: "W. Trevor King" <[email protected]> > > 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. > --- > targets/support/kmerge.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh > index ce1dddf..e78e0b4 100644 > --- 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 ] > -- > 1.8.2.rc0.16.g20a599e > >
Thanks, pushed!
