From cd531c81e2eb2c319d2516ae36d888d2b35bafc9 Mon Sep 17 00:00:00 2001 From: Jeroen Smit Date: Wed, 13 Nov 2019 20:42:53 +0100 Subject: [PATCH 1/2] Fixed issue with sed command: on macOs the -E option was taken as the argument of the -i option causing backups to be made with the addional extension -E. also the backslash of the \s needed additional escaping --- ci/clean_trailing_spaces.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/clean_trailing_spaces.sh b/ci/clean_trailing_spaces.sh index 9900df6ab5fe..ea1de3587789 100755 --- a/ci/clean_trailing_spaces.sh +++ b/ci/clean_trailing_spaces.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash # trailing whitespaces -sed -i -E 's#\s+$##g' config/set/*/*.yaml docs/*.md README.md +sed -i '' -E 's#\\s+$##g' config/set/*/*.yaml docs/*.md README.md From c4bf31c9c8dfa2fb18ae192b556e82d3d9100b76 Mon Sep 17 00:00:00 2001 From: Jeroen Smit Date: Wed, 13 Nov 2019 20:54:33 +0100 Subject: [PATCH 2/2] ignore space change (whitelines are removed by fix-cs) --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ca86351c74c5..327ad070a59d 100644 --- a/composer.json +++ b/composer.json @@ -199,8 +199,8 @@ "changelog-linker cleanup" ], "check-docs": [ - "bin/rector dump-rectors -o markdown | diff docs/AllRectorsOverview.md - ", - "bin/rector dump-nodes -o markdown | diff docs/NodesOverview.md - " + "bin/rector dump-rectors -o markdown | diff --ignore-space-change docs/AllRectorsOverview.md - ", + "bin/rector dump-nodes -o markdown | diff --ignore-space-change docs/NodesOverview.md - " ], "docs": [ "bin/rector dump-rectors -o markdown > docs/AllRectorsOverview.md",