Skip to content

Commit 9ac91d5

Browse files
committed
Move --simply option to editorconfig
Because in v3.12.0 using --simplify on the commandline disables editorconfig processing. Ref mvdan/sh#1173 Signed-off-by: Jan Dubois <jan.dubois@suse.com>
1 parent 4ed32f4 commit 9ac91d5

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ indent_style = tab
1818

1919
[*.{sh,bash,bats}]
2020
indent_size = 4
21+
simplify = true

bats/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ lint:
1919
find tests -name '*.bash' | xargs shellcheck -s bash -e $(SC_EXCLUDES)
2020
find tests -name '*.bats' | xargs shellcheck -s bash -e $(SC_EXCLUDES)
2121
find scripts -name '*.sh' | xargs shellcheck -s bash -e $(SC_EXCLUDES)
22-
find tests -name '*.bash' | xargs shfmt --simplify --diff --indent 4
23-
find tests -name '*.bats' | xargs shfmt --simplify --diff --indent 4
24-
find scripts -name '*.sh' | xargs shfmt --simplify --diff --indent 4
22+
find tests -name '*.bash' | xargs shfmt --diff
23+
find tests -name '*.bats' | xargs shfmt --diff
24+
find scripts -name '*.sh' | xargs shfmt --diff
2525

2626
DEPS = bin/darwin/jq bin/linux/jq
2727

0 commit comments

Comments
 (0)