Skip to content

Commit ee50385

Browse files
committed
utils.sh :: support Numix and Numix Frost when generating CHANGES file
(cherry picked from commit 07bd693)
1 parent 5b07932 commit ee50385

1 file changed

Lines changed: 23 additions & 6 deletions

File tree

scripts/utils.sh

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,32 @@ output_changes_file_version_marker() {
4848

4949

5050
update_changes_file() {
51-
local LAST_STABLE_RELEASE NEXT_STABLE_RELEASE
52-
53-
LAST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1))
54-
51+
LAST_STABLE_RELEASE=$(git describe --abbrev=0 --tags $(git rev-list --tags --max-count=1))
5552
LAST_MAJOR_MINOR="${LAST_STABLE_RELEASE%.*}"
53+
54+
LAST_MAJOR="${LAST_STABLE_RELEASE%%.*}"
55+
LAST_MINOR="${LAST_MAJOR_MINOR#*.}"
5656
LAST_PATCH="${LAST_STABLE_RELEASE##*.}"
5757

58-
NEXT_PATCH=$(($LAST_PATCH + 1))
59-
NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}"
58+
case "${PWD##*/}" in
59+
Numix)
60+
NEXT_PATCH=$(($LAST_PATCH + 1))
61+
62+
NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}"
63+
;;
64+
65+
Numix-Frost)
66+
LAST_MAJOR=$(($LAST_MAJOR + 1))
67+
NEXT_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}"
68+
LAST_PATCH=$(($LAST_PATCH - 1))
69+
70+
LAST_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}"
71+
;;
72+
73+
*)
74+
echo 'Unknown directory!' && exit 1
75+
;;
76+
esac
6077

6178
[[ -f CHANGES ]] && mv CHANGES CHANGES.old
6279

0 commit comments

Comments
 (0)