From 00aedbf4704f45daeeedcb2c3abcbc3b174dab98 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Sun, 7 Apr 2019 17:48:23 +0200
Subject: [PATCH] Update changelog and release notes at once

---
 ci/commit-beta-changelog.sh | 12 ------------
 ci/commit-changelog.sh      | 13 +++++++++++++
 ci/commit-release-notes.sh  |  5 -----
 3 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100755 ci/commit-beta-changelog.sh
 create mode 100755 ci/commit-changelog.sh
 delete mode 100755 ci/commit-release-notes.sh

diff --git a/ci/commit-beta-changelog.sh b/ci/commit-beta-changelog.sh
deleted file mode 100755
index 74e7568d..00000000
--- a/ci/commit-beta-changelog.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-VERSION=`ci/version-number.sh`
-BUILD=$((`ci/build-number.sh` + 1))
-DATE=`date "+%Y-%m-%d"`
-TARGET="CHANGELOG.md"
-
-sed "s/Unreleased/$VERSION Beta $BUILD ($DATE)/" $TARGET >$TARGET.tmp
-mv $TARGET.tmp $TARGET
-git add $TARGET
-git commit -m "Set beta release"
-
-ci/latest-changelog.sh >ci/$TARGET
diff --git a/ci/commit-changelog.sh b/ci/commit-changelog.sh
new file mode 100755
index 00000000..3a33021e
--- /dev/null
+++ b/ci/commit-changelog.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+VERSION=`ci/version-number.sh`
+BUILD=$((`ci/build-number.sh` + 1))
+DATE=`date "+%Y-%m-%d"`
+CHANGELOG="CHANGELOG.md"
+RELEASE_NOTES="fastlane/metadata/en-US/release_notes.txt"
+
+sed "s/Unreleased/$VERSION Beta $BUILD ($DATE)/" $CHANGELOG >$CHANGELOG.tmp
+mv $CHANGELOG.tmp $CHANGELOG
+ci/latest-changelog.sh | sed -E "s/^(.*) \[#.*$/\1/" >ci/$CHANGELOG
+cp ci/$CHANGELOG $RELEASE_NOTES
+git add $CHANGELOG $RELEASE_NOTES
+git commit -m "Set beta release"
diff --git a/ci/commit-release-notes.sh b/ci/commit-release-notes.sh
deleted file mode 100755
index ac593f10..00000000
--- a/ci/commit-release-notes.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-TARGET="fastlane/metadata/en-US/release_notes.txt"
-ci/latest-changelog.sh | sed -E "s/^(.*) \[#.*$/\1/" >$TARGET
-git add $TARGET
-git commit -m "Update release notes (en)"