| 1 |
commit: 37540ff5e9db28e65a4f55b71c16cec1e7d294ec |
| 2 |
Author: W. Trevor King <wking <AT> tremily <DOT> us> |
| 3 |
AuthorDate: Fri Mar 1 05:57:39 2013 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Mar 1 06:06:18 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=37540ff5 |
| 7 |
|
| 8 |
kmerge.sh: Fix line wrapping typo from 9ceebbf |
| 9 |
|
| 10 |
In 9ceebbf (kmerge.sh: Make /var/tmp/${clst_kname}.config optional, |
| 11 |
2013-02-09), I added a KERNCACHE check to a `[` test, wrapping the two |
| 12 |
clauses in the test to avoid a very long line. Unfortunately, |
| 13 |
newlines do not appear to be legal in this position. For example: |
| 14 |
|
| 15 |
$ if [ -n "a" -a |
| 16 |
> -n "b" ]; then echo "c"; fi |
| 17 |
bash: [: missing `]' |
| 18 |
bash: -n: command not found |
| 19 |
|
| 20 |
This commit fixes the error by explicitly wrapping the line with a |
| 21 |
backslash. |
| 22 |
|
| 23 |
Reviewed-by: Matt Turner <mattst88 <AT> gmail.com> |
| 24 |
|
| 25 |
--- |
| 26 |
targets/support/kmerge.sh | 2 +- |
| 27 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 28 |
|
| 29 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 30 |
index ce1dddf..e78e0b4 100644 |
| 31 |
--- a/targets/support/kmerge.sh |
| 32 |
+++ b/targets/support/kmerge.sh |
| 33 |
@@ -180,7 +180,7 @@ then |
| 34 |
fi |
| 35 |
|
| 36 |
CONFIG_MATCH=0 |
| 37 |
-if [ -n "${clst_KERNCACHE}" -a |
| 38 |
+if [ -n "${clst_KERNCACHE}" -a \ |
| 39 |
-e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] |
| 40 |
then |
| 41 |
if [ ! -e /var/tmp/${clst_kname}.config ] |
Archives