From 19dab79581ba4a196262e7b3f11d918c68f23fcf Mon Sep 17 00:00:00 2001
From: pooya parsa <pooya@pi0.ir>
Date: Thu, 14 Mar 2019 14:14:47 +0330
Subject: [PATCH] improve commits script

---
 .gitignore      |  1 +
 scripts/commits | 34 ++++++++++++++++++----------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 356b4b7b3..dd1e0c60b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@ coverage
 Network Trash Folder
 Temporary Items
 .apdisk
+commits.md
diff --git a/scripts/commits b/scripts/commits
index f161b0268..7230d0128 100755
--- a/scripts/commits
+++ b/scripts/commits
@@ -4,23 +4,25 @@
 
 latestTag=`git describe | grep -oE "^[^-]+"`
 
-echo "Comaparing $latestTag...dev"
+rm commits.md
+
+write() {
+  echo "$@"
+  echo "$@" >> commits.md
+}
+
+write "Comaparing $latestTag...dev"
 
 diff=`git --no-pager log $latestTag...dev --pretty="%s (%an) (%h)"`
 
-echo
-echo "# Features"
-echo "$diff" | awk '/feat/'
-echo "$diff" | awk '/feat/' | grep -oE "[0-9a-f]{8}" > .git/feat.txt
+write
+write "## Features"
+write
+res=`echo "$diff" | awk '/feat/' | grep ":" | grep -v "renovate"  | sed -e 's/^/- /' | sort`
+write "$res"
 
-echo
-echo "# Fixes"
-echo "$diff" | awk '!/feat/'
-echo "$diff" | awk '!/feat/' | grep -oE "[0-9a-f]{8}" > .git/fix.txt
-
-echo
-echo "To apply diff into target banch:"
-echo "$ git cherry-pick \`tac .git/fix.txt\`"
-echo "In case of conflicts:"
-echo "$ yarn"
-echo "$ git cherry-pick --continue"
+write
+write "## Fixes"
+write
+res=`echo "$diff" | awk '!/feat/' | grep ":" | grep -v "renovate" | sed -e 's/^/- /' | sort`
+write "$res"