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

ruby-changes:11242

From: nobu <ko1@a...>
Date: Mon, 9 Mar 2009 15:20:07 +0900 (JST)
Subject: [ruby-changes:11242] Ruby:r22851 (trunk): * instruby.rb (manpages): use basename to compare and for Tempfile.

nobu	2009-03-09 15:19:57 +0900 (Mon, 09 Mar 2009)

  New Revision: 22851

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

  Log:
    * instruby.rb (manpages): use basename to compare and for Tempfile.

  Modified files:
    trunk/ChangeLog
    trunk/instruby.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22850)
+++ ChangeLog	(revision 22851)
@@ -1,3 +1,7 @@
+Mon Mar  9 15:19:55 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* instruby.rb (manpages): use basename to compare and for Tempfile.
+
 Mon Mar  9 14:55:27 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* instruby.rb (default gems): installs default gemspecs.
Index: instruby.rb
===================================================================
--- instruby.rb	(revision 22850)
+++ instruby.rb	(revision 22851)
@@ -452,19 +452,20 @@
   require File.join(srcdir, "tool/mdoc2man.rb") if $mantype != "doc"
   mdocs.each do |mdoc|
     next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
-    if mdoc == "goruby.1"
+    base = File.basename(mdoc)
+    if base == "goruby.1"
       next unless has_goruby
     end
 
     destdir = mandir + (section = mdoc[/\d+$/])
-    destname = ruby_install_name.sub(/ruby/, File.basename(mdoc, ".#{section}"))
+    destname = ruby_install_name.sub(/ruby/, base.chomp(".#{section}"))
     destfile = File.join(destdir, "#{destname}.#{section}")
 
     if $mantype == "doc"
       install mdoc, destfile, :mode => $data_mode
     else
       w = nil
-      Tempfile.open(mdoc) do |f|
+      Tempfile.open(base) do |f|
         w = f
         open(mdoc) {|r| Mdoc2Man.mdoc2man(r, w)}
       end

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

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