1 |
On Thu, Feb 28, 2013 at 9:57 PM, W. Trevor King <wking@×××××××.us> wrote: |
2 |
> From: "W. Trevor King" <wking@×××××××.us> |
3 |
> |
4 |
> In 9ceebbf (kmerge.sh: Make /var/tmp/${clst_kname}.config optional, |
5 |
> 2013-02-09), I added a KERNCACHE check to a `[` test, wrapping the two |
6 |
> clauses in the test to avoid a very long line. Unfortunately, |
7 |
> newlines do not appear to be legal in this position. For example: |
8 |
> |
9 |
> $ if [ -n "a" -a |
10 |
> > -n "b" ]; then echo "c"; fi |
11 |
> bash: [: missing `]' |
12 |
> bash: -n: command not found |
13 |
> |
14 |
> This commit fixes the error by explicitly wrapping the line with a |
15 |
> backslash. |
16 |
> --- |
17 |
> targets/support/kmerge.sh | 2 +- |
18 |
> 1 file changed, 1 insertion(+), 1 deletion(-) |
19 |
> |
20 |
> diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
21 |
> index ce1dddf..e78e0b4 100644 |
22 |
> --- a/targets/support/kmerge.sh |
23 |
> +++ b/targets/support/kmerge.sh |
24 |
> @@ -180,7 +180,7 @@ then |
25 |
> fi |
26 |
> |
27 |
> CONFIG_MATCH=0 |
28 |
> -if [ -n "${clst_KERNCACHE}" -a |
29 |
> +if [ -n "${clst_KERNCACHE}" -a \ |
30 |
> -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] |
31 |
> then |
32 |
> if [ ! -e /var/tmp/${clst_kname}.config ] |
33 |
> -- |
34 |
> 1.8.2.rc0.16.g20a599e |
35 |
> |
36 |
> |
37 |
|
38 |
Thanks, pushed! |