diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/application/apply.rb (renamed from lib/puppet/application/main.rb) | 2 | ||||
| -rw-r--r-- | lib/puppet/util/command_line.rb | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/puppet/application/main.rb b/lib/puppet/application/apply.rb index 2952ef4ae..787ce375f 100644 --- a/lib/puppet/application/main.rb +++ b/lib/puppet/application/apply.rb @@ -4,7 +4,7 @@ require 'puppet/configurer' require 'puppet/network/handler' require 'puppet/network/client' -Puppet::Application.new(:main) do +Puppet::Application.new(:apply) do should_parse_config diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index 59454364c..ba474df91 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -2,12 +2,10 @@ module Puppet module Util module CommandLine def self.shift_subcommand_from_argv( argv = ARGV, stdin = STDIN ) - if ! argv.first - "main" unless stdin.tty? # ttys get usage info - elsif argv.first =~ /^-|\.pp$|\.rb$/ - "main" - else - argv.shift + case argv.first + when nil; "apply" unless stdin.tty? # ttys get usage info + when /^-|\.pp$|\.rb$/; "apply" + else argv.shift end end end |