From 159e0e81341e15bc10e82378e502e4f2f2e65c9c Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 6 Aug 2020 01:34:18 +0530 Subject: [PATCH] citemplate: Allow spaces in filenames when indenting Part-of: --- gitlab/ci_template.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index ad15cc62e8..147d34225c 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -359,19 +359,19 @@ gst indent: # man indent. grep RETURN VALUE, grab a beer on my behalf... - indent --version || true - | - filter_cmd="cat" + filter_cmd=("cat") if test -f ".indentignore"; then - filter_args="" + filter_args=() while read -r line; do if test -n "$line"; then - filter_args="$filter_args -e $line" + filter_args+=("-e" "$line") fi done < ".indentignore" - if test -n "$filter_args"; then - filter_cmd="grep -v $filter_args" + if [[ ${#filter_args[@]} -gt 0 ]]; then + filter_cmd=("grep" "-v" "${filter_args[@]}") fi fi - find . -name '*.c' | $filter_cmd | xargs gst-indent + find . -name '*.c' | "${filter_cmd[@]}" | xargs -d '\n' gst-indent - | if git diff --quiet; then echo "Code is properly formatted"