summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-02-05 17:19:29 -0800
committerTim Smith <tsmith84@gmail.com>2020-02-06 13:53:00 -0800
commit3cc840234b32ac5e4887179bbcfa8305877eebbf (patch)
treeedace11e9dd1eeb35842704aded4bd373962ed44
parentf8c467b2a5df25230f979848589401c5704e1a73 (diff)
downloadchef-3cc840234b32ac5e4887179bbcfa8305877eebbf.tar.gz
Rework the welcome text to be more helpful
Get rid of the old Ohai meme reference Link to the specific doc on how to use the shell Give the version of chef-shell and don't mention Chef Infra Client Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/shell.rb3
-rw-r--r--lib/chef/shell/ext.rb6
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb
index 15dde343c8..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
diff --git a/lib/chef/shell/ext.rb b/lib/chef/shell/ext.rb
index fd978e0aa7..a3437f958f 100644
--- a/lib/chef/shell/ext.rb
+++ b/lib/chef/shell/ext.rb
@@ -210,10 +210,8 @@ module Shell
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