From d540470e5808e218b71f9305cd07f19537130a3b Mon Sep 17 00:00:00 2001 From: Rick Barenthin Date: Wed, 1 Jun 2022 22:55:32 +0200 Subject: [PATCH] build(conventi): update `conventi.sh` for correct newlines --- build/conventi/conventi.sh | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/build/conventi/conventi.sh b/build/conventi/conventi.sh index e6cc25a..cc9f527 100755 --- a/build/conventi/conventi.sh +++ b/build/conventi/conventi.sh @@ -199,9 +199,9 @@ get_breaking_change() { format_entry_line() { line="" if [ -n "$2" ]; then - line="**$2:**" + line="**$2:** " fi - line="$line $1" + line="$line$1" echo "$line ([$3]($(get_config_url)/commit/$3))" | sed -e '2,$s/^[ ]*/ /' } @@ -270,43 +270,43 @@ add_changelog_entry_line() { format_entry() { entry="" if [ -n "$breaking_change_lines" ]; then - entry=$(printf '%s### BREAKING CHANGES ๐Ÿšจ\n%s\n\n' "$entry" "$breaking_change_lines") + entry=$(printf '%s\n\n\n### BREAKING CHANGES ๐Ÿšจ\n%s\n' "$entry" "$breaking_change_lines") fi if [ -n "$bugfix_lines" ]; then - entry=$(printf '%s### Bug fixes ๐Ÿฉน\n%s\n\n' "$entry" "$bugfix_lines") + entry=$(printf '%s\n\n\n### Bug fixes ๐Ÿฉน\n%s\n' "$entry" "$bugfix_lines") fi if [ -n "$feature_lines" ]; then - entry=$(printf '%s### Features ๐Ÿ“ฆ\n%s\n\n' "$entry" "$feature_lines") + entry=$(printf '%s\n\n\n### Features ๐Ÿ“ฆ\n%s\n' "$entry" "$feature_lines") fi if [ -n "$revert_lines" ]; then - entry=$(printf '%s### Reverts ๐Ÿ”™\n%s\n\n' "$entry" "$revert_lines") + entry=$(printf '%s\n\n\n### Reverts ๐Ÿ”™\n%s\n' "$entry" "$revert_lines") fi if [ -n "$build_lines" ]; then - entry=$(printf '%s### Build System ๐Ÿ—\n%s\n\n' "$entry" "$build_lines") + entry=$(printf '%s\n\n\n### Build System ๐Ÿ—\n%s\n' "$entry" "$build_lines") fi if [ -n "$chore_lines" ]; then - entry=$(printf '%s### Chores ๐Ÿงฝ\n%s\n\n' "$entry" "$chore_lines") + entry=$(printf '%s\n\n\n### Chores ๐Ÿงฝ\n%s\n' "$entry" "$chore_lines") fi if [ -n "$ci_lines" ]; then - entry=$(printf '%s### CIs โš™๏ธ\n%s\n\n' "$entry" "$ci_lines") + entry=$(printf '%s\n\n\n### CIs โš™๏ธ\n%s\n' "$entry" "$ci_lines") fi if [ -n "$doc_lines" ]; then - entry=$(printf '%s### Docs ๐Ÿ“‘\n%s\n\n' "$entry" "$doc_lines") + entry=$(printf '%s\n\n\n### Docs ๐Ÿ“‘\n%s\n' "$entry" "$doc_lines") fi if [ -n "$test_lines" ]; then - entry=$(printf '%s### Tests ๐Ÿงช\n%s\n\n' "$entry" "$test_lines") + entry=$(printf '%s\n\n\n### Tests ๐Ÿงช\n%s\n' "$entry" "$test_lines") fi if [ -n "$style_lines" ]; then - entry=$(printf '%s### Styles ๐Ÿ–ผ\n%s\n\n' "$entry" "$style_lines") + entry=$(printf '%s\n\n\n### Styles ๐Ÿ–ผ\n%s\n' "$entry" "$style_lines") fi if [ -n "$refactor_lines" ]; then - entry=$(printf '%s### Refactors ๐Ÿ› \n%s\n\n' "$entry" "$refactor_lines") + entry=$(printf '%s\n\n\n### Refactors ๐Ÿ› \n%s\n' "$entry" "$refactor_lines") fi if [ -n "$perf_lines" ]; then - entry=$(printf '%s### Performance ๐ŸŽ\n%s\n\n' "$entry" "$perf_lines") + entry=$(printf '%s\n\n\n### Performance ๐ŸŽ\n%s\n' "$entry" "$perf_lines") fi if [ -n "$entry" ]; then - entry=$(printf '## [%s](%s/compare/%s...%s) (%s)\n\n\n%s' "$version" "$(get_config_url)" "$from_hash" "$to_hash" "$(date '+%Y-%m-%d')" "$entry") + entry=$(printf '## [%s](%s/compare/%s...%s) (%s)%s' "$version" "$(get_config_url)" "$from_hash" "$to_hash" "$(date '+%Y-%m-%d')" "$entry") fi echo "$entry" } @@ -338,7 +338,11 @@ generate_changelog_entry() { line=$(format_entry_line "$description" "$scope" "$hash") if [ "$is_breaking" -eq 1 ] && [ -z "$breaking_change" ]; then - breaking_change="$body" + if [ -n "$body" ]; then + breaking_change="$body" + else + breaking_change="$description" + fi fi if [ "$is_breaking" -eq 1 ]; then