diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-04-30 14:54:07 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 63e2e56d3172bdc80aaca5f5ddde5811728e3c76 (patch) | |
| tree | 38e3607fe83223d135f1c327682dbd8698bb138d /lib/puppet/defaults.rb | |
| parent | b6e2ce6a85c953fcd57a3b837ccaa794a634dc22 (diff) | |
| download | puppet-63e2e56d3172bdc80aaca5f5ddde5811728e3c76.tar.gz puppet-63e2e56d3172bdc80aaca5f5ddde5811728e3c76.tar.xz puppet-63e2e56d3172bdc80aaca5f5ddde5811728e3c76.zip | |
feature #2276 Single Executable: subcommand method
Extract the logic to determine the subcommand name into a method.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index a9cb48419..66f038307 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -5,19 +5,8 @@ module Puppet conf = nil var = nil - legacy_name = Hash.new{ |h,k| k }.update({ - 'agent' => 'puppetd', - 'cert' => 'puppetca', - 'doc' => 'puppetdoc', - 'filebucket' => 'filebucket', - 'apply' => 'puppet', - 'describe' => 'pi', - 'queue' => 'puppetqd', - 'resource' => 'ralsh', - 'kick' => 'puppetrun', - 'master' => 'puppetmasterd', - }) - name = legacy_name[ $puppet_subcommand_name ] || $0.gsub(/.+#{File::SEPARATOR}/,'').sub(/\.rb$/, '') + require 'puppet/util/command_line' + name = Puppet::Util::CommandLine.legacy_executable_name # Make File.expand_path happy require 'etc' |