summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-10 17:11:24 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-10 17:11:24 +0000
commit35466dd4c280b4d81bdf0824268fc1830d4ccfe0 (patch)
tree9139c26dc7dd2340b16883b03be5b60690e0bdf7
parentb11cc1815e3b1a23e06fdddd40e188b78e69cb79 (diff)
downloadruby-35466dd4c280b4d81bdf0824268fc1830d4ccfe0.tar.gz
ruby-35466dd4c280b4d81bdf0824268fc1830d4ccfe0.tar.xz
ruby-35466dd4c280b4d81bdf0824268fc1830d4ccfe0.zip
ri now reads command-line options from RI environment variable
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--lib/rdoc/ri/ri_options.rb6
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b07713fbd..91219c2eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
+ Also accept command line options via the 'RI' environment variable.
+
+Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
+ Also accept command line options via the 'RI' environment variable.
+
Fri Jan 9 10:05:14 2004 Siena. <siena@faculty.chiba-u.jp>
* lib/mkmf.rb (libpathflag): use single quotes. [ruby-dev:22440]
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
index c62335c14..0e720a9c6 100644
--- a/lib/rdoc/ri/ri_options.rb
+++ b/lib/rdoc/ri/ri_options.rb
@@ -150,6 +150,7 @@ module RI
end
puts
end
+ puts "Options may also be passed in the 'RI' environment varaible"
exit 0
end
end
@@ -164,6 +165,11 @@ module RI
@formatter = RI::TextFormatter.for("plain")
@list_classes = false
+ old_argv = ARGV.dup
+ if ENV["RI"]
+ ARGV.replace(ENV["RI"].split.concat(ARGV))
+ end
+
begin
go = GetoptLong.new(*OptionList.options)