diff options
author | Tim Smith <tsmith@chef.io> | 2020-02-06 14:39:54 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-06 14:39:54 -0800 |
commit | 5c11f8fbc1abf2d78bd8f400f9adbc9ce5bb322b (patch) | |
tree | 9f71caea7485c443d12a59acbf8720ede708f9fd | |
parent | 6c432308e6e5784585117a674650ef214f581a5b (diff) | |
parent | 2d9098479eaf486985b7268c012e35160f83d58e (diff) | |
download | chef-5c11f8fbc1abf2d78bd8f400f9adbc9ce5bb322b.tar.gz |
Merge pull request #9345 from chef/backports
Improve welcome text in chef-shell
-rw-r--r-- | lib/chef/shell.rb | 9 | ||||
-rw-r--r-- | lib/chef/shell/ext.rb | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb index 68c286abb1..29ff6ea66a 100644 --- a/lib/chef/shell.rb +++ b/lib/chef/shell.rb @@ -159,11 +159,10 @@ module Shell puts "run `help' for help, `exit' or ^D to quit." puts - puts "Ohai2u#{greeting}!" end def self.greeting - " #{Etc.getlogin}@#{Shell.session.node["fqdn"]}" + "#{Etc.getlogin}@#{Shell.session.node["fqdn"]}" rescue NameError, ArgumentError "" end @@ -241,7 +240,7 @@ module Shell option :standalone, short: "-a", long: "--standalone", - description: "standalone session", + description: "Standalone session", default: true, boolean: true @@ -255,7 +254,7 @@ module Shell option :client, short: "-z", long: "--client", - description: "#{Chef::Dist::CLIENT} session", + description: "#{Chef::Dist::PRODUCT} session", boolean: true option :solo_legacy_shell, @@ -273,7 +272,7 @@ module Shell option :chef_server_url, short: "-S CHEFSERVERURL", long: "--server CHEFSERVERURL", - description: "The #{Chef::Dist::PRODUCT} server URL", + description: "The #{Chef::Dist::SERVER_PRODUCT} URL", proc: nil option :version, diff --git a/lib/chef/shell/ext.rb b/lib/chef/shell/ext.rb index fd978e0aa7..8640216d45 100644 --- a/lib/chef/shell/ext.rb +++ b/lib/chef/shell/ext.rb @@ -204,16 +204,14 @@ module Shell else puts help_banner end - :ucanhaz_halp + :help end alias :halp :help desc "prints information about #{Chef::Dist::PRODUCT}" def version - puts "This is the #{Chef::Dist::SHELL}.\n" + - " #{Chef::Dist::PRODUCT} Version: #{::Chef::VERSION}\n" + - " #{Chef::Dist::WEBSITE}\n" + - " https://docs.chef.io/" + puts "Welcome to the #{Chef::Dist::SHELL} #{::Chef::VERSION}\n" + + "For usage see https://docs.chef.io/chef_shell.html" :ucanhaz_automation end alias :shell :version |