summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]bin/main (renamed from bin/puppet)4
-rw-r--r--lib/puppet/application/main.rb (renamed from lib/puppet/application/puppet.rb)2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/puppet b/bin/main
index 931e3a993..542bf4095 100755..100644
--- a/bin/puppet
+++ b/bin/main
@@ -67,5 +67,5 @@
# Copyright (c) 2005 Reductive Labs, LLC
# Licensed under the GNU Public License
-require 'puppet/application/puppet'
-Puppet::Application[:puppet].run
+require 'puppet/application/main'
+Puppet::Application[:main].run
diff --git a/lib/puppet/application/puppet.rb b/lib/puppet/application/main.rb
index 2f7946b3d..faa317623 100644
--- a/lib/puppet/application/puppet.rb
+++ b/lib/puppet/application/main.rb
@@ -4,7 +4,7 @@ require 'puppet/configurer'
require 'puppet/network/handler'
require 'puppet/network/client'
-Puppet::Application.new(:puppet) do
+Puppet::Application.new(:main) do
should_parse_config