diff --git a/tools/patternfly.sed b/tools/patternfly.sed index 9db08af3baee..cc69bf42be29 100644 --- a/tools/patternfly.sed +++ b/tools/patternfly.sed @@ -1,8 +1,8 @@ -s/src: url(.*eot[^']*');$// +s/src: url(.*eot[^'"]*['"]);$// s/src: url.*glyphicons-halflings-regular.woff.*/src: url('fonts\/glyphicons.woff') format('woff');/ s/src: url.*fontawesome-webfont.woff.*/src: url('fonts\/fontawesome.woff?v=4.2.0') format('woff');/ s/src: url.*PatternFlyIcons-webfont.woff.*/src: url('fonts\/patternfly.woff') format('woff');/ -s/src: url.*OpenSans-\([^']*\).woff.*/src: url('..\/..\/static\/fonts\/OpenSans-\1.woff') format('woff');/ +s/src:.*url.*OpenSans-\([^'"]*\).woff.*/src: url('..\/..\/static\/fonts\/OpenSans-\1.woff') format('woff');/ s/url('..\/img\//url('images\// s/url("..\/img\//url("images\// diff --git a/tools/test-static-code b/tools/test-static-code index 2418bdbae031..d6aee37a7e32 100755 --- a/tools/test-static-code +++ b/tools/test-static-code @@ -2,8 +2,9 @@ # run static code checks like pyflakes and pep8 set -eu -echo "1..4" +echo "1..5" +builddir=$(pwd) cd "${srcdir:-.}" fail=0 @@ -80,4 +81,16 @@ else echo "ok 4 unsafe-security-policy" fi +# +# Bad paths or modifications in patternfly for fonts +# + +if grep "\.\./fonts/OpenSans\|fonts/.*eot\|truetype" dist/*/*.css $builddir/dist/*/*.css >&2; then + echo "ERROR: invalid patternfly fonts paths found" >&2 + echo "not ok 5 patternfly-font-paths" + fail=1 +else + echo "ok 5 patternfly-font-paths" +fi + exit $fail