diff --git a/Library/Homebrew/compat/utils.rb b/Library/Homebrew/compat/utils.rb new file mode 100644 index 0000000000..7de5e85c32 --- /dev/null +++ b/Library/Homebrew/compat/utils.rb @@ -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 diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index f78fbfcb7f..8e6a9b7d7e 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -519,16 +519,6 @@ 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 - def disk_usage_readable(size_in_bytes) if size_in_bytes >= 1_073_741_824 size = size_in_bytes.to_f / 1_073_741_824 diff --git a/Library/Homebrew/utils/shell.rb b/Library/Homebrew/utils/shell.rb index 19e696795f..c0d6b90ae6 100644 --- a/Library/Homebrew/utils/shell.rb +++ b/Library/Homebrew/utils/shell.rb @@ -76,7 +76,7 @@ module Utils def self.prepend_path_in_shell_profile(path) case preferred_shell 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 "echo 'setenv PATH #{csh_quote(path)}:$PATH' >> #{shell_profile}" when :fish