From 219f68abfeb4a42ff6eac89e550a8b98bde08cb3 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 22 Apr 2016 06:07:19 +0000 Subject: [PATCH] * tool/redmine-backporter.rb: the fullpath of merger.rb is too long to copy&paste on Windows. show shorter name instead on the platform. I'm sure that the user of this command on Windows is only me. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ tool/redmine-backporter.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5c1cee9824..b6d2f3a3a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 22 15:04:56 2016 NAKAMURA Usaku + + * tool/redmine-backporter.rb: the fullpath of merger.rb is too long to + copy&paste on Windows. show shorter name instead on the platform. + I'm sure that the user of this command on Windows is only me. + Fri Apr 22 14:52:04 2016 NAKAMURA Usaku * tool/merger.rb: remove temporary file. diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb index 0806e63f24..01ec04225e 100755 --- a/tool/redmine-backporter.rb +++ b/tool/redmine-backporter.rb @@ -300,7 +300,7 @@ def show_last_journal(http, uri) end def merger_path - File.expand_path('../merger.rb', __FILE__) + RUBY_PLATFORM =~ /mswin|mingw/ ? 'merger' : File.expand_path('../merger.rb', __FILE__) end def backport_command_string