nagachika	2016-03-29 02:00:42 +0900 (Tue, 29 Mar 2016)

  New Revision: 54337

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54337

  Log:
    * lib/rubygems/installer.rb: merge partially r49511.
      cherry picking https://github.com/rubygems/rubygems/commit/f9232680
      [Bug #12066]

  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/rubygems/installer.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54336)
+++ ruby_2_2/version.h	(revision 54337)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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
Index: ruby_2_2/lib/rubygems/installer.rb
===================================================================
--- ruby_2_2/lib/rubygems/installer.rb	(revision 54336)
+++ ruby_2_2/lib/rubygems/installer.rb	(revision 54337)
@@ -681,7 +681,7 @@ TEXT https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/rubygems/installer.rb#L681
   # 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
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54336)
+++ ruby_2_2/ChangeLog	(revision 54337)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 01:56:24 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* 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@r...>
 
 	* string.c (enc_succ_alnum_char): try to skip an invalid character

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/