diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-16 11:09:21 +0100 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-07-19 20:20:21 +0000 |
| commit | 2b9a378e7024dae98d16ce2de1468f65a095f309 (patch) | |
| tree | ba118fba9a32ccdc7c3df67dde80d8c4b0373d83 /strata/chef | |
| parent | 7d3a901a14c1b3d6f636af9e60a5f84f5ad0777c (diff) | |
| download | definitions-2b9a378e7024dae98d16ce2de1468f65a095f309.tar.gz | |
Reformat all definitions according to a consistent style
This was done using the 'indent' tool, which uses a fork of PyYAML named
'ruamel.yaml' to rewrite YAML files without losing comments, ordering,
or certain elements of formatting.
My aim with doing this is to open the door to automated editing of the
reference system definitions using the 'ruamel.yaml' library. This can
be used to implement automated migration when we want to make changes to
the YAML format that we use to represent Baserock system definitions.
Although this looks drastic, remember that it's actually only altered
65 out of 608 .morph files -- the vast majority already pass unchanged
through my version of ruamel.yaml.
Change-Id: I95ec978714b5bd1c02c90183336a9fbb846cb692
Diffstat (limited to 'strata/chef')
| -rw-r--r-- | strata/chef/erubis-master.morph | 4 | ||||
| -rw-r--r-- | strata/chef/hoe-master.morph | 1 | ||||
| -rw-r--r-- | strata/chef/libyajl2-1.0.1.morph | 4 | ||||
| -rw-r--r-- | strata/chef/plist-master.morph | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/strata/chef/erubis-master.morph b/strata/chef/erubis-master.morph index f15e0968..05d1a9f9 100644 --- a/strata/chef/erubis-master.morph +++ b/strata/chef/erubis-master.morph @@ -1,4 +1,3 @@ ---- name: erubis-master kind: chunk build-system: manual @@ -10,7 +9,8 @@ configure-commands: # Manually do what it seems like the 'rook' build system would do, if it worked # Values taken from 'Rookbook.props'. - find -type f -exec sed -e 's/\$Release\$/2.7.0/g' -i \{} \; -- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com all rights reserved./g' -i \{} \; +- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com + all rights reserved./g' -i \{} \; build-commands: - gem build erubis.gemspec install-commands: diff --git a/strata/chef/hoe-master.morph b/strata/chef/hoe-master.morph index 9fe7ff8e..1a468789 100644 --- a/strata/chef/hoe-master.morph +++ b/strata/chef/hoe-master.morph @@ -1,4 +1,3 @@ ---- name: hoe-master kind: chunk build-system: manual diff --git a/strata/chef/libyajl2-1.0.1.morph b/strata/chef/libyajl2-1.0.1.morph index d85d1567..7a21831d 100644 --- a/strata/chef/libyajl2-1.0.1.morph +++ b/strata/chef/libyajl2-1.0.1.morph @@ -9,5 +9,5 @@ build-commands: - USE_SYSTEM_LIBYAJL2=yes gem build libyajl2.gemspec install-commands: - mkdir -p "$DESTDIR/$(gem environment home)" -- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin" - --ignore-dependencies --local ./libyajl2-1.0.1.gem +- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)" + --bindir "$DESTDIR/$PREFIX/bin" --ignore-dependencies --local ./libyajl2-1.0.1.gem diff --git a/strata/chef/plist-master.morph b/strata/chef/plist-master.morph index bef39f7d..7cf7cbb6 100644 --- a/strata/chef/plist-master.morph +++ b/strata/chef/plist-master.morph @@ -1,4 +1,3 @@ ---- name: plist-master kind: chunk build-system: manual |