homebrew-bigsur/install
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #756 from ChillerDragon/pr_rel_bin_path2

Browse Source 
Fix `./bin` being in `$PATH`
This commit is contained in:
Mike McQuaid
2023-03-15 12:11:42 -04:00
committed by GitHub
parent 16aefe107e 11bcaa8fdb
commit 010d7b3f54
1 changed files with 71 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
install.sh
View File

@@ -73,7 +73,7 @@ ohai() {
}
warn() {
printf "${tty_red}Warning${tty_reset}: %s\n" "$(chomp "$1")"
printf "${tty_red}Warning${tty_reset}: %s\n" "$(chomp "$1")" >&2
}
# Check if script is run non-interactively (e.g. CI)
@@ -384,7 +384,12 @@ test_git() {
local git_version_output
git_version_output="$("$1" --version 2>/dev/null)"
version_ge "$(major_minor "${git_version_output##* }")" "$(major_minor "${REQUIRED_GIT_VERSION}")"
if [[ "${git_version_output}" =~ "git version "([^ ]*).* ]]
then
version_ge "$(major_minor "${BASH_REMATCH[1]}")" "$(major_minor "${REQUIRED_GIT_VERSION}")"
else
abort "Unexpected Git version: '${git_version_output}'!"
fi
}
# Search for the given executable in PATH (avoids a dependency on the `which` command)
@@ -405,7 +410,10 @@ find_tool() {
local executable
while read -r executable
do
if "test_$1" "${executable}"
if [[ "${executable}" != /* ]]
then
warn "Ignoring ${executable} (relative paths don't work)"
elif "test_$1" "${executable}"
then
echo "${executable}"
break
@@ -447,65 +455,6 @@ fi
cd "/usr" || exit 1
####################################################################### script
USABLE_GIT="$(command -v git)"
if [[ -z "${USABLE_GIT}" ]]
then
abort "$(
cat <<EOABORT
You must install Git before installing Homebrew. See:
${tty_underline}https://docs.brew.sh/Installation${tty_reset}
EOABORT
)"
elif [[ -n "${HOMEBREW_ON_LINUX-}" ]]
then
USABLE_GIT="$(find_tool git)"
if [[ -z "${USABLE_GIT}" ]]
then
abort "$(
cat <<EOABORT
The version of Git that was found does not satisfy requirements for Homebrew.
Please install Git ${REQUIRED_GIT_VERSION} or newer and add it to your PATH.
EOABORT
)"
elif [[ "${USABLE_GIT}" != /usr/bin/git ]]
then
export HOMEBREW_GIT_PATH="${USABLE_GIT}"
ohai "Found Git: ${HOMEBREW_GIT_PATH}"
fi
fi
if ! command -v curl >/dev/null
then
abort "$(
cat <<EOABORT
You must install cURL before installing Homebrew. See:
${tty_underline}https://docs.brew.sh/Installation${tty_reset}
EOABORT
)"
elif [[ -n "${HOMEBREW_ON_LINUX-}" ]]
then
USABLE_CURL="$(find_tool curl)"
if [[ -z "${USABLE_CURL}" ]]
then
abort "$(
cat <<EOABORT
The version of cURL that was found does not satisfy requirements for Homebrew.
Please install cURL ${REQUIRED_CURL_VERSION} or newer and add it to your PATH.
EOABORT
)"
elif [[ "${USABLE_CURL}" != /usr/bin/curl ]]
then
export HOMEBREW_CURL_PATH="${USABLE_CURL}"
ohai "Found cURL: ${HOMEBREW_CURL_PATH}"
fi
fi
# Set HOMEBREW_DEVELOPER on Linux systems where usable Git/cURL is not in /usr/bin
if [[ -n "${HOMEBREW_ON_LINUX-}" && (-n "${HOMEBREW_CURL_PATH-}" || -n "${HOMEBREW_GIT_PATH-}") ]]
then
ohai "Setting HOMEBREW_DEVELOPER to use Git/cURL not in /usr/bin"
export HOMEBREW_DEVELOPER=1
fi
# shellcheck disable=SC2016
ohai 'Checking for `sudo` access (which may request your password)...'
@@ -883,6 +832,66 @@ EOABORT
)"
fi
USABLE_GIT="$(find_tool git)"
if [[ -z "${USABLE_GIT}" ]]
then
abort "$(
cat <<EOABORT
You must install Git before installing Homebrew. See:
${tty_underline}https://docs.brew.sh/Installation${tty_reset}
EOABORT
)"
elif [[ -n "${HOMEBREW_ON_LINUX-}" ]]
then
USABLE_GIT="$(find_tool git)"
if [[ -z "${USABLE_GIT}" ]]
then
abort "$(
cat <<EOABORT
The version of Git that was found does not satisfy requirements for Homebrew.
Please install Git ${REQUIRED_GIT_VERSION} or newer and add it to your PATH.
EOABORT
)"
elif [[ "${USABLE_GIT}" != /usr/bin/git ]]
then
export HOMEBREW_GIT_PATH="${USABLE_GIT}"
ohai "Found Git: ${HOMEBREW_GIT_PATH}"
fi
fi
if ! command -v curl >/dev/null
then
abort "$(
cat <<EOABORT
You must install cURL before installing Homebrew. See:
${tty_underline}https://docs.brew.sh/Installation${tty_reset}
EOABORT
)"
elif [[ -n "${HOMEBREW_ON_LINUX-}" ]]
then
USABLE_CURL="$(find_tool curl)"
if [[ -z "${USABLE_CURL}" ]]
then
abort "$(
cat <<EOABORT
The version of cURL that was found does not satisfy requirements for Homebrew.
Please install cURL ${REQUIRED_CURL_VERSION} or newer and add it to your PATH.
EOABORT
)"
elif [[ "${USABLE_CURL}" != /usr/bin/curl ]]
then
export HOMEBREW_CURL_PATH="${USABLE_CURL}"
ohai "Found cURL: ${HOMEBREW_CURL_PATH}"
fi
fi
# Set HOMEBREW_DEVELOPER on Linux systems where usable Git/cURL is not in /usr/bin
if [[ -n "${HOMEBREW_ON_LINUX-}" && (-n "${HOMEBREW_CURL_PATH-}" || -n "${HOMEBREW_GIT_PATH-}") ]]
then
ohai "Setting HOMEBREW_DEVELOPER to use Git/cURL not in /usr/bin"
export HOMEBREW_DEVELOPER=1
fi
ohai "Downloading and installing Homebrew..."
(
cd "${HOMEBREW_REPOSITORY}" >/dev/null || return