From f5ea994eea0a500aa7981d16e85445d3f4173b42 Mon Sep 17 00:00:00 2001 From: Lukas Holecek <hluk@email.cz> Date: Sat, 10 Apr 2021 13:36:45 +0200 Subject: [PATCH] Update CHANGES.md file name references --- RELEASE.md | 2 +- utils/bump_version.sh | 4 ++-- utils/create_source_package.sh | 2 +- utils/fedora/copyq.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 5a274cbb2..761ea2cde 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -8,7 +8,7 @@ This is step-by-step description on how to release new version of CopyQ. # Update Version and Changelog -Update CHANGES file. +Update `CHANGES.md` file. Bump version. diff --git a/utils/bump_version.sh b/utils/bump_version.sh index 94aad6053..265dd40e8 100755 --- a/utils/bump_version.sh +++ b/utils/bump_version.sh @@ -18,7 +18,7 @@ version=$1 version_file=version.cmake appdata_file=shared/com.github.hluk.copyq.appdata.xml itemwidget_file=src/item/itemwidget.h -changes_file=CHANGES +changes_file=CHANGES.md check_version_format() { if ! grep -q '^[0-9]\+\.[0-9]\+\.[0-9]\+$' <<< "$version"; then @@ -29,7 +29,7 @@ check_version_format() { check_changes() { last_changes_version=$(head -1 "$changes_file") - if [[ "$last_changes_version" != "v$version" ]]; then + if [[ "$last_changes_version" != "# v$version" ]]; then echo "Update $changes_file first" exit 1 fi diff --git a/utils/create_source_package.sh b/utils/create_source_package.sh index ed7501d7c..9ec43bd61 100755 --- a/utils/create_source_package.sh +++ b/utils/create_source_package.sh @@ -10,7 +10,7 @@ die () { exit 1 } -grep -q '^v'"$version"'$' CHANGES || +grep -q '^# v'"$version"'$' "CHANGES.md" || die "CHANGES file doesn't contain changes for given version!" grep -q '"v'"$version"'"' "$version_header" || diff --git a/utils/fedora/copyq.spec b/utils/fedora/copyq.spec index 3e9216877..6f1388196 100644 --- a/utils/fedora/copyq.spec +++ b/utils/fedora/copyq.spec @@ -48,7 +48,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/com.github.hluk.%{ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/com.github.hluk.%{name}.appdata.xml %files -f %{name}.lang -%doc AUTHORS CHANGES HACKING README.md +%doc AUTHORS CHANGES.md HACKING README.md %license LICENSE %{_bindir}/%{name} %{_libdir}/%{name}/ -- GitLab