From ed9938171f80c7534f6eb52f75c2538bca462807 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 4 Dec 2013 11:29:29 +0000 Subject: Modify the block's character of yaml to avoid future problems When blocks of text are flowed with >, e.g. key: value foo: > The quick brown fox jumps over the lazy dog. The new-lines of the text block are removed. This causes confusion when shell scripts are involved, as the following Yaml would be parsed as one shell command, rather than two: command: > echo foo bar ls This escaped detection since if text is indented, Yaml treats it as a different block, so command: > if true; then echo foo bar fi is parsed correctly, but command: > if true; then echo foo bar ls fi is not. To avoid this confusion, we can always use `|`, which will preserve the newlines, so an explicit continuation can be requested with a `\` at the end of the line. command: | echo foo bar \ baz quux --- openssl-new.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl-new.morph b/openssl-new.morph index d92bba165d..2ed14ff248 100644 --- a/openssl-new.morph +++ b/openssl-new.morph @@ -3,7 +3,7 @@ kind: chunk max-jobs: 1 configure-commands: - sed -i -e 's,^LIBNAMES=\\(.*\\) padlock \\(.*\\),LIBNAMES=\\1 \\2,g' engines/Makefile -- > +- | if [ "$(uname -m)" = "ppc64" ]; then sh ./Configure linux-ppc64 --openssldir=/etc/ssl --prefix="${PREFIX-/usr}" --libdir=lib shared else -- cgit v1.2.1