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-05 17:19:29 -0800
commit85b1c5bcd4e5724b3e12591686c8cd9c12755077 (patch)
tree2e9ce3a3ab896ce359575722fff299882df2549e
parent503798696bcf55d6171e6b86d8e169f3038271a3 (diff)
downloadchef-85b1c5bcd4e5724b3e12591686c8cd9c12755077.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 17e1d782c3..d22400176c 100644
--- a/lib/chef/shell.rb
+++ b/lib/chef/shell.rb
@@ -166,11 +166,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