[前][次][番号順一覧][スレッド一覧]

ruby-changes:21517

From: nobu <ko1@a...>
Date: Sun, 30 Oct 2011 10:50:48 +0900 (JST)
Subject: [ruby-changes:21517] nobu:r33566 (trunk): * tool/rbinstall.rb (install_recursive, bin-comm): split mere

nobu	2011-10-30 10:50:38 +0900 (Sun, 30 Oct 2011)

  New Revision: 33566

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33566

  Log:
    * tool/rbinstall.rb (install_recursive, bin-comm): split mere
      string not path name.  [ruby-core:40462] [Bug #5492]

  Modified files:
    trunk/ChangeLog
    trunk/tool/rbinstall.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33565)
+++ ChangeLog	(revision 33566)
@@ -1,3 +1,8 @@
+Sun Oct 30 10:50:36 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/rbinstall.rb (install_recursive, bin-comm): split mere
+	  string not path name.  [ruby-core:40462] [Bug #5492]
+
 Sun Oct 30 10:47:20 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_cloexec_dup, rb_cloexec_dup2): CLOEXEC has been set if
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 33565)
+++ tool/rbinstall.rb	(revision 33566)
@@ -241,7 +241,7 @@
     if dir
       makedirs(d)
     else
-      makedirs(File.dirname(d))
+      makedirs(d[/.*(?=\/)/m])
       if block_given?
         yield src, d, opts
       else
@@ -443,7 +443,7 @@
     trans = proc {|base| base}
   end
   install_recursive(File.join(srcdir, "bin"), bindir) do |src, cmd|
-    cmd = File.join(File.dirname(cmd), RbConfig.expand(trans[File.basename(cmd)]))
+    cmd = cmd.sub(/[^\/]*\z/m) {|n| RbConfig.expand(trans[n])}
 
     shebang = ''
     body = ''

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

[前][次][番号順一覧][スレッド一覧]