From 35f2fd5027ed150fd90e41f253a3418b9fc0848c Mon Sep 17 00:00:00 2001 From: Geert Josten Date: Mon, 12 Jun 2017 10:23:31 +0200 Subject: [PATCH] Fixed #802: check both for CHANGELOG.md and .mdown at up/downgrade --- deploy/lib/upgrader.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/deploy/lib/upgrader.rb b/deploy/lib/upgrader.rb index e7236a94..754d8c08 100644 --- a/deploy/lib/upgrader.rb +++ b/deploy/lib/upgrader.rb @@ -44,7 +44,16 @@ def upgrade_src(tmp_dir) end def upgrade_base(tmp_dir) - FileUtils.cp tmp_dir + '/CHANGELOG.mdown', '.' + if File.exists?('CHANGELOG.mdown') then + FileUtils.rm_f 'CHANGELOG.mdown' + elsif File.exists?('CHANGELOG.md') then + FileUtils.rm_f 'CHANGELOG.md' + end + if File.exists?(tmp_dir + '/CHANGELOG.mdown') then + FileUtils.cp tmp_dir + '/CHANGELOG.mdown', '.' + elsif File.exists?(tmp_dir + '/CHANGELOG.md') then + FileUtils.cp tmp_dir + '/CHANGELOG.md', '.' + end FileUtils.cp tmp_dir + '/ml', '.' FileUtils.cp tmp_dir + '/ml.bat', '.' FileUtils.cp tmp_dir + '/version.txt', '.'