aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/diagnostic.rb
diff options
context:
space:
mode:
authorGreg Nisbet2016-08-10 23:19:09 -0700
committerGreg Nisbet2016-08-10 23:19:09 -0700
commit9a29a306cfd6b116a0cb696ce56bd7bc7679a8e3 (patch)
tree19eefeaea0baf5c39e2ea0795d2774ae852a8022 /Library/Homebrew/diagnostic.rb
parent06fe347de97975dc01e726f87bf07a56a6fb713e (diff)
downloadbrew-9a29a306cfd6b116a0cb696ce56bd7bc7679a8e3.tar.bz2
resolve conflict in diagnostic.rb
Diffstat (limited to 'Library/Homebrew/diagnostic.rb')
-rw-r--r--Library/Homebrew/diagnostic.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index 5d83c4b5a..b2f92c5f4 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -3,6 +3,7 @@ require "language/python"
require "formula"
require "version"
require "development_tools"
+require "utils/shell"
module Homebrew
module Diagnostic
@@ -475,7 +476,7 @@ module Homebrew
Consider setting your PATH so that #{HOMEBREW_PREFIX}/bin
occurs before /usr/bin. Here is a one-liner:
- echo 'export PATH="#{HOMEBREW_PREFIX}/bin:$PATH"' >> #{shell_profile}
+ echo 'export PATH="#{HOMEBREW_PREFIX}/bin:$PATH"' >> #{Utils::Shell.shell_profile}
EOS
end
end
@@ -495,7 +496,7 @@ module Homebrew
<<-EOS.undent
Homebrew's bin was not found in your PATH.
Consider setting the PATH for example like so
- echo 'export PATH="#{HOMEBREW_PREFIX}/bin:$PATH"' >> #{shell_profile}
+ echo 'export PATH="#{HOMEBREW_PREFIX}/bin:$PATH"' >> #{Utils::Shell.shell_profile}
EOS
end
@@ -510,7 +511,7 @@ module Homebrew
Homebrew's sbin was not found in your PATH but you have installed
formulae that put executables in #{HOMEBREW_PREFIX}/sbin.
Consider setting the PATH for example like so
- echo 'export PATH="#{HOMEBREW_PREFIX}/sbin:$PATH"' >> #{shell_profile}
+ echo 'export PATH="#{HOMEBREW_PREFIX}/sbin:$PATH"' >> #{Utils::Shell.shell_profile}
EOS
end