Skip to content

Conversation

@hoffie
Copy link
Member

@hoffie hoffie commented Apr 6, 2022

Short description of changes

  • Scripts: Add .editorconfig with shfmt style definition
  • Scripts: Adjust code which shfmt can't handle properly
  • Scripts: Run shfmt -w .

(A CI check will be in a follow-up PR: hoffie@ci-check-shell-scripts)

CHANGELOG: Scripts: Applied a consistent coding style

Context: Fixes an issue?

Related: #2474

Does this change need documentation? What needs to be documented and how?

No.

Status of this Pull Request

Ready.

What is missing until this pull request can be merged?

Reviews.

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

@hoffie hoffie added this to the Release 3.9.0 milestone Apr 6, 2022
Comment on lines +17 to +28
declare -A LANGS
LANGS[de_DE]="German"
LANGS[fr_FR]="French"
LANGS[it_IT]="Italian"
LANGS[nl_NL]="Dutch"
LANGS[pl_PL]="Polish"
LANGS[pt_BR]="Portuguese Brazilian"
LANGS[pt_PT]="Portuguese European"
LANGS[sk_SK]="Slovak"
LANGS[es_ES]="Spanish"
LANGS[sv_SE]="Swedish"
LANGS[zh_CN]="Simplified Chinese"
Copy link
Member Author

@hoffie hoffie Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a manual change (before running shfmt) as shfmt fails to handle the previous formatting properly (each shfmt increases the indentation...). I don't know of a way to selectively disable shfmt for specific lines similar to shellcheck or clang-format. Therefore, I've chosen a different array assignment syntax, although as it is more verbose.

@hoffie hoffie requested a review from pljones April 7, 2022 21:35
@ann0see
Copy link
Member

ann0see commented Apr 21, 2022

@hoffie this PR needs to be rebased ;-)

@ann0see
Copy link
Member

ann0see commented May 19, 2022

Thanks. @hoffie This PR needs rebasing

@hoffie hoffie force-pushed the autobuild/shfmt branch from 3db8173 to bdbe302 Compare May 19, 2022 20:33
@hoffie hoffie force-pushed the autobuild/shfmt branch from bdbe302 to 66bdcf2 Compare May 19, 2022 20:47
@hoffie hoffie merged commit 9d8f07d into jamulussoftware:master May 20, 2022
@ann0see
Copy link
Member

ann0see commented Jul 25, 2022

@pljones This missed the mentioning of "scripts" in the Changelog

@pljones
Copy link
Collaborator

pljones commented Jul 26, 2022

I was wondering if this should be merged with 2547.

@ann0see
Copy link
Member

ann0see commented Jul 26, 2022

Maybe. The changelog is already way too big...

@pljones
Copy link
Collaborator

pljones commented Jul 26, 2022

Yeah - that's why I was asking for suggesting on what to merge...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants