fix errors in pre-commit hook

larsks · larsks · commit 57f26e7541b3 · 2015-05-08T16:31:00.000-04:00
Change-Id: I143da402e1cff54a6b9193bc404040020494c638
diff --git a/tools/pre-commit-hook b/tools/pre-commit-hook
@@ -21,8 +21,6 @@ cd $tmpdir
 echo "=== yaml checks ==="
 
 (
-find . -name '*.yaml' -print0
-[ -d fragments ] &&
-	find fragments -type f | xargs grep -l '^#cloud-config'
+find * \( -name '*.yaml' -o -exec grep -q '^#cloud-config' \; \) -print0
 ) | xargs -0 python ${TOPLEVEL}/tools/validate-yaml.py -v || exit 1
 

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ cd $tmpdir`
`21`	`21`	`echo "=== yaml checks ==="`
`22`	`22`
`23`	`23`	`(`
`24`		`-find . -name '*.yaml' -print0`
`25`		`-[ -d fragments ] &&`
`26`		`- find fragments -type f \| xargs grep -l '^#cloud-config'`
	`24`	`+find * \( -name '*.yaml' -o -exec grep -q '^#cloud-config' \; \) -print0`
`27`	`25`	`) \| xargs -0 python ${TOPLEVEL}/tools/validate-yaml.py -v \|\| exit 1`
`28`	`26`