* lib/rubygems/installer.rb: merge partially r49511.

  cherry picking https://github.com/rubygems/rubygems/commit/f9232680
  [Bug #12066]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f07be877e6..1f536eec49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 29 01:56:24 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* lib/rubygems/installer.rb: merge partially r49511.
+	  cherry picking https://github.com/rubygems/rubygems/commit/f9232680
+	  [Bug #12066]
+
 Tue Mar 29 01:41:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (enc_succ_alnum_char): try to skip an invalid character
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index 877cb21b7c..10fc1a34a5 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -681,7 +681,7 @@ TEXT
   # return the stub script text used to launch the true Ruby script
 
   def windows_stub_script(bindir, bin_file_name)
-    ruby = Gem.ruby.chomp('"').tr(File::SEPARATOR, "\\")
+    ruby = Gem.ruby.gsub(/^\"|\"$/, "").tr(File::SEPARATOR, "\\")
     return <<-TEXT
 @ECHO OFF
 IF NOT "%~f0" == "~f0" GOTO :WinNT
diff --git a/version.h b/version.h
index 8a3e04b9c6..56655f8ade 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 279
+#define RUBY_PATCHLEVEL 280
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3