diff options
author | W. Trevor King <wking@tremily.us> | 2013-03-01 00:57:39 -0500 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2013-02-28 22:06:18 -0800 |
commit | 37540ff5e9db28e65a4f55b71c16cec1e7d294ec (patch) | |
tree | d6dc4c9f71ee0158b66721176c5881a93eddfae3 /targets | |
parent | kmerge.sh: Make /var/tmp/${clst_kname}.config optional (diff) | |
download | catalyst-37540ff5e9db28e65a4f55b71c16cec1e7d294ec.tar.gz catalyst-37540ff5e9db28e65a4f55b71c16cec1e7d294ec.tar.bz2 catalyst-37540ff5e9db28e65a4f55b71c16cec1e7d294ec.zip |
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>
Diffstat (limited to 'targets')
-rw-r--r-- | targets/support/kmerge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index ce1dddff..e78e0b49 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 ] |