diff options
| author | Xu Cheng | 2015-03-24 21:03:20 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-03-24 21:18:32 +0800 |
| commit | ca0c778ce4cd88887d7b07292b284680278fdb56 (patch) | |
| tree | 008ddb0f6f74cdcd683e7d4be4bf2d44d29646a3 /Library | |
| parent | 49d0e7a609c5a01ca382c617472250b8d5643b6c (diff) | |
| download | homebrew-ca0c778ce4cd88887d7b07292b284680278fdb56.tar.bz2 | |
add method to detect shell profile file based on users' preference shell
Closes #38017.
Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/formula_cellar_checks.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/utils.rb | 10 |
3 files changed, 14 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index e11047074..4d253e639 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -570,7 +570,7 @@ def check_user_path_1 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"' >> ~/.bash_profile + echo 'export PATH="#{HOMEBREW_PREFIX}/bin:$PATH"' >> #{shell_profile} EOS end end @@ -588,7 +588,7 @@ def check_user_path_2 <<-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"' >> ~/.bash_profile + echo 'export PATH="#{HOMEBREW_PREFIX}/bin:$PATH"' >> #{shell_profile} EOS end end @@ -602,7 +602,7 @@ def check_user_path_3 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"' >> ~/.bash_profile + echo 'export PATH="#{HOMEBREW_PREFIX}/sbin:$PATH"' >> #{shell_profile} EOS end end diff --git a/Library/Homebrew/formula_cellar_checks.rb b/Library/Homebrew/formula_cellar_checks.rb index 98d1073ea..89f3a45f5 100644 --- a/Library/Homebrew/formula_cellar_checks.rb +++ b/Library/Homebrew/formula_cellar_checks.rb @@ -12,7 +12,7 @@ module FormulaCellarChecks <<-EOS.undent #{prefix_bin} is not in your PATH - You can amend this by altering your ~/.bashrc file + You can amend this by altering your #{shell_profile} file EOS end diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 4b2feb053..2cdd920c9 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -291,6 +291,16 @@ def paths end.uniq.compact end +# return the shell profile file based on users' preference shell +def shell_profile + case ENV["SHELL"] + when %r{/(ba)?sh} then "~/.bash_profile" + when %r{/zsh} then "~/.zshrc" + when %r{/ksh} then "~/.kshrc" + else "~/.bash_profile" + end +end + module GitHub extend self ISSUES_URI = URI.parse("https://api.github.com/search/issues") |
