diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-04-21 00:09:28 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | bfad735335bfd65d48b14af2998bd4ce2d86ab96 (patch) | |
| tree | 1e017262b7d7cc3701bd2effe11e8666e5aff1c0 /lib | |
| parent | 71033786bf4abef4fd486793d6fe186fff87a432 (diff) | |
| download | puppet-bfad735335bfd65d48b14af2998bd4ce2d86ab96.tar.gz puppet-bfad735335bfd65d48b14af2998bd4ce2d86ab96.tar.xz puppet-bfad735335bfd65d48b14af2998bd4ce2d86ab96.zip | |
feature #2276 Single Executable: rdoc paths on ubuntu
on ubuntu, --help was failing to find the path to the old executables,
which still contain the rdoc help message
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index a80f42289..1245b1006 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -115,7 +115,7 @@ require 'optparse' class Puppet::Application include Puppet::Util - BINDIRS = File.expand_path(File.dirname(__FILE__)) + '/../../{sbin,bin}' + BINDIRS = %w{sbin bin}.map{|dir| File.expand_path(File.dirname(__FILE__)) + "/../../#{dir}/*"}.join(" ") @@applications = {} def self.applications; @@applications end @@ -375,7 +375,7 @@ class Puppet::Application # RH:FIXME: My goodness, this is ugly. ::RDoc.const_set("PuppetSourceFile", @name) def (::RDoc).caller - docfile = `grep -l 'Puppet::Application\\[:#{::RDoc::PuppetSourceFile}\\]' #{BINDIRS}/*`.chomp + docfile = `grep -l 'Puppet::Application\\[:#{::RDoc::PuppetSourceFile}\\]' #{BINDIRS}`.chomp super << "#{docfile}:0" end ::RDoc::usage && exit |