admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

move shell_profile to compat/utils.rb & deprecate

Browse Source
This commit is contained in:
Greg Nisbet 2016-06-14 22:31:48 -07:00
parent bf63c08d50
commit dcc3377aa3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/compat/utils.rb Normal file
View File

@ -0,0 +1,10 @@
# return the shell profile file based on users' preference shell
def shell_profile
opoo "shell_profile has been deprecated in favor of Utils::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

10
Library/Homebrew/utils.rb
View File

@ -519,16 +519,6 @@ def paths
end.uniq.compact end.uniq.compact
end 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
def disk_usage_readable(size_in_bytes) def disk_usage_readable(size_in_bytes)
if size_in_bytes >= 1_073_741_824 if size_in_bytes >= 1_073_741_824
size = size_in_bytes.to_f / 1_073_741_824 size = size_in_bytes.to_f / 1_073_741_824

2
Library/Homebrew/utils/shell.rb
View File

@ -76,7 +76,7 @@ module Utils
def self.prepend_path_in_shell_profile(path) def self.prepend_path_in_shell_profile(path)
case preferred_shell case preferred_shell
when :bash, :ksh, :sh, :zsh, nil when :bash, :ksh, :sh, :zsh, nil
"echo 'export PATH=\"#{sh_quote(path)}:$PATH'\" >> #{shell_profile}" "echo 'export PATH=\"#{sh_quote(path)}:$PATH\"' >> #{shell_profile}"
when :csh, :tcsh when :csh, :tcsh
"echo 'setenv PATH #{csh_quote(path)}:$PATH' >> #{shell_profile}" "echo 'setenv PATH #{csh_quote(path)}:$PATH' >> #{shell_profile}"
when :fish when :fish