From 776e3f192cc93d4f3b87069883c69c4004cc399f Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Wed, 21 Sep 2016 23:13:08 -0500 Subject: [PATCH] update utils.sh. fix missing new line in CHANGES file. --- CHANGES | 5 +++-- scripts/utils.sh | 26 +++++++++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 3e99f42..e540d14 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,8 @@ [2016-09-21 22:05:08 -0500] move assets into src directory Dustin Falgout {8df9804} [2016-09-21 22:04:17 -0500] move assets into src directory Dustin Falgout {c769c23} [2016-09-21 22:01:55 -0500] move assets into src directory Dustin Falgout {a0f0e73} -[2016-09-22 01:21:54 +0530] Fix code in utils.sh Khurshid Alam {a50dee0}[2016-09-21 13:13:52 -0500] reenable old xfce styles in 3.20 until we can rewrite them. Dustin Falgout {3dc0bbe} +[2016-09-22 01:21:54 +0530] Fix code in utils.sh Khurshid Alam {a50dee0} +[2016-09-21 13:13:52 -0500] reenable old xfce styles in 3.20 until we can rewrite them. Dustin Falgout {3dc0bbe} [2016-09-21 21:43:04 +0530] Copy proper gtk.css in utils.sh. Fixes #569 Khurshid Alam {679bb1d} [2016-09-20 22:12:57 +0530] [Gtk-3.18] Re-enable xfce style. Fixes #566 Khurshid Alam {a0263e7} [2016-09-18 06:01:08 -0500] fix errors in do_install function Dustin Falgout {a3ab032} @@ -67,4 +68,4 @@ [2016-07-20 00:37:58 +0530] Drop support for Gtk-3.16 Khurshid Alam {c565223} [2016-07-20 00:21:53 +0530] [Gtk-3.18] Provide gap between buttons in message dialog. Fixes #498 Khurshid Alam {58642c3} [2016-07-15 08:59:15 +0300] Fix for issue #492 (#496) Alexey Donoga {76321bb} -[2016-07-02 07:44:33 +0200] GTK 3.20 :: Optimized Nemo and Nautilus design and update searchbar.. Csaba Jakosa {bd780f0} \ No newline at end of file +[2016-07-02 07:44:33 +0200] GTK 3.20 :: Optimized Nemo and Nautilus design and update searchbar.. Csaba Jakosa {bd780f0} diff --git a/scripts/utils.sh b/scripts/utils.sh index e718d4b..769d439 100755 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -34,21 +34,37 @@ do_install() { } +output_changes_file_version_marker() { + + line() { + dashes="$(printf '%0.s-' $(seq 1 13))" + echo "${dashes}>>>> $1 <<<<${dashes}" + } + + tag_line="$(line $1)" + + echo "-${tag_line}${tag_line}${tag_line}-" +} + + 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 + output_changes_file_version_marker "${LATEST_STABLE_RELEASE}" > CHANGES + { git log \ --pretty=format:"[%ai] %<(69,trunc) %s %><(15) %aN {%h}" \ - --cherry-pick "${LATEST_STABLE_RELEASE}...HEAD"; } > CHANGES + --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 + [[ -f CHANGES.old ]] && echo "" >> CHANGES && cat CHANGES.old >> CHANGES && rm CHANGES.old + + #git add CHANGES + #git commit -m 'RELEASE PREP :: Update CHANGES file.' + #git push }