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

Do not specify absolute paths to utilities

Browse Source 
Specifying an absolute path to utilities is no longer needed,
since environment filtering uses a default PATH.
This commit is contained in:
Shaun Jackman 2017-12-11 15:32:57 -08:00
parent 7b558e0522
commit a4033c7196
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/brew.sh
View File

@ -85,7 +85,7 @@ case "$HOMEBREW_SYSTEM" in
Linux) HOMEBREW_LINUX="1" ;; Linux) HOMEBREW_LINUX="1" ;;
esac esac
HOMEBREW_CURL="/usr/bin/curl" HOMEBREW_CURL="curl"
if [[ -n "$HOMEBREW_MACOS" ]] if [[ -n "$HOMEBREW_MACOS" ]]
then then
HOMEBREW_PROCESSOR="$(uname -p)" HOMEBREW_PROCESSOR="$(uname -p)"
@ -136,7 +136,7 @@ else
fi fi
fi fi
HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)" HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)"
HOMEBREW_CURL_VERSION="$("$HOMEBREW_CURL" --version 2>/dev/null | head -n1 | /usr/bin/awk '{print $1"/"$2}')" HOMEBREW_CURL_VERSION="$("$HOMEBREW_CURL" --version 2>/dev/null | head -n1 | awk '{print $1"/"$2}')"
HOMEBREW_USER_AGENT_CURL="$HOMEBREW_USER_AGENT $HOMEBREW_CURL_VERSION" HOMEBREW_USER_AGENT_CURL="$HOMEBREW_USER_AGENT $HOMEBREW_CURL_VERSION"
# Declared in bin/brew # Declared in bin/brew

6
Library/Homebrew/keg_relocate.rb
View File

@ -96,7 +96,7 @@ class Keg
alias generic_recursive_fgrep_args recursive_fgrep_args alias generic_recursive_fgrep_args recursive_fgrep_args
def each_unique_file_matching(string) def each_unique_file_matching(string)
Utils.popen_read("/usr/bin/fgrep", recursive_fgrep_args, string, to_s) do |io| Utils.popen_read("fgrep", recursive_fgrep_args, string, to_s) do |io|
hardlinks = Set.new hardlinks = Set.new
until io.eof? until io.eof?
@ -113,7 +113,7 @@ class Keg
def text_files def text_files
text_files = [] text_files = []
return text_files unless File.exist?("/usr/bin/file") return text_files unless which("file") && which("xargs")
# file has known issues with reading files on other locales. Has # file has known issues with reading files on other locales. Has
# been fixed upstream for some time, but a sufficiently new enough # been fixed upstream for some time, but a sufficiently new enough
@ -132,7 +132,7 @@ class Keg
end end
false false
} }
output, _status = Open3.capture2("/usr/bin/xargs -0 /usr/bin/file --no-dereference --print0", output, _status = Open3.capture2("xargs -0 file --no-dereference --print0",
stdin_data: files.to_a.join("\0")) stdin_data: files.to_a.join("\0"))
# `file` output sometimes contains data from the file, which may include # `file` output sometimes contains data from the file, which may include
# invalid UTF-8 entities, so tell Ruby this is just a bytestring # invalid UTF-8 entities, so tell Ruby this is just a bytestring

2
Library/Homebrew/utils.rb
View File

@ -344,7 +344,7 @@ def which_editor
editor = %w[atom subl mate edit vim].find do |candidate| editor = %w[atom subl mate edit vim].find do |candidate|
candidate if which(candidate, ENV["HOMEBREW_PATH"]) candidate if which(candidate, ENV["HOMEBREW_PATH"])
end end
editor ||= "/usr/bin/vim" editor ||= "vim"
opoo <<~EOS opoo <<~EOS
Using #{editor} because no editor was set in the environment. Using #{editor} because no editor was set in the environment.

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

@ -3,7 +3,7 @@ require "open3"
def curl_executable def curl_executable
curl = Pathname.new ENV["HOMEBREW_CURL"] curl = Pathname.new ENV["HOMEBREW_CURL"]
curl = Pathname.new "/usr/bin/curl" unless curl.exist? curl = which("curl") unless curl.exist?
return curl if curl.executable? return curl if curl.executable?
raise "#{curl} is not executable" raise "#{curl} is not executable"
end end