From 0e6c45ba196ad6acb79c32e9f38781cfa6bef1de Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Sun, 18 Sep 2016 04:14:33 -0500 Subject: [PATCH] add task to makefile for generating/updating CHANGES file before releases --- .editorconfig | 4 ++++ Makefile | 12 +++--------- scripts/utils.sh | 30 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 9 deletions(-) create mode 100755 scripts/utils.sh diff --git a/.editorconfig b/.editorconfig index 169cf9a..cc42978 100644 --- a/.editorconfig +++ b/.editorconfig @@ -27,3 +27,7 @@ indent_size = 2 [Makefile] indent_style = tab indent_size = 4 + +[*.sh] +indent_style = tab +indent_size = 4 diff --git a/Makefile b/Makefile index 54c04b3..858eb8c 100755 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ RES_DIR320=gtk-3.20 SCSS_DIR320=$(RES_DIR320)/scss DIST_DIR320=$(RES_DIR320)/dist INSTALL_DIR=$(DESTDIR)/usr/share/themes/Numix -LATEST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1)) +UTILS=scripts/utils.sh all: clean gresource @@ -57,14 +57,8 @@ uninstall: rm -rf $(INSTALL_DIR) changes: - [ -f CHANGES ] && mv CHANGES CHANGES.old - git log \ - --pretty=format:"[%ai] %<(69,trunc) %s %><(15) %aN {%h}" \ - --cherry-pick "${LATEST_STABLE_RELEASE}...HEAD" > CHANGES - [ -f CHANGES.old ] && cat CHANGES.old >> CHANGES && rm CHANGES.old - git add CHANGES - git commit -m 'RELEASE PREP :: Update CHANGES file.' - git push + $(UTILS) changes + .PHONY: all .PHONY: css diff --git a/scripts/utils.sh b/scripts/utils.sh new file mode 100755 index 0000000..aa28265 --- /dev/null +++ b/scripts/utils.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +update_changes_file() { + local LATEST_STABLE_RELEASE + LATEST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1)) + + [[ -f CHANGES ]] && mv CHANGES CHANGES.old + + { git log \ + --pretty=format:"[%ai] %<(69,trunc) %s %><(15) %aN {%h}" \ + --cherry-pick "${LATEST_STABLE_RELEASE}...HEAD"; } > CHANGES + + [[ -f CHANGES.old ]] && cat CHANGES.old >> CHANGES && rm CHANGES.old + + git add CHANGES + git commit -m 'RELEASE PREP :: Update CHANGES file.' + git push +} + + +case $1 in + changes) + update_changes_file + exit $? + ;; + + *) + exit 0 + ;; +esac