From ee50385aff55e2732ace677e6f58b6906a699bf6 Mon Sep 17 00:00:00 2001
From: Dustin Falgout <dustin@falgout.us>
Date: Sun, 23 Oct 2016 00:11:17 -0500
Subject: [PATCH] utils.sh :: support Numix and Numix Frost when generating
CHANGES file
(cherry picked from commit 07bd693)
---
scripts/utils.sh | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/scripts/utils.sh b/scripts/utils.sh
index d18a52b..a890e3a 100755
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -48,15 +48,32 @@ output_changes_file_version_marker() {
update_changes_file() {
- local LAST_STABLE_RELEASE NEXT_STABLE_RELEASE
-
- LAST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1))
-
+ LAST_STABLE_RELEASE=$(git describe --abbrev=0 --tags $(git rev-list --tags --max-count=1))
LAST_MAJOR_MINOR="${LAST_STABLE_RELEASE%.*}"
+
+ LAST_MAJOR="${LAST_STABLE_RELEASE%%.*}"
+ LAST_MINOR="${LAST_MAJOR_MINOR#*.}"
LAST_PATCH="${LAST_STABLE_RELEASE##*.}"
- NEXT_PATCH=$(($LAST_PATCH + 1))
- NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}"
+ case "${PWD##*/}" in
+ Numix)
+ NEXT_PATCH=$(($LAST_PATCH + 1))
+
+ NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}"
+ ;;
+
+ Numix-Frost)
+ LAST_MAJOR=$(($LAST_MAJOR + 1))
+ NEXT_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}"
+ LAST_PATCH=$(($LAST_PATCH - 1))
+
+ LAST_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}"
+ ;;
+
+ *)
+ echo 'Unknown directory!' && exit 1
+ ;;
+ esac
[[ -f CHANGES ]] && mv CHANGES CHANGES.old