Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update.sh: parse GitHub API token from repository URL #16649

Merged
merged 16 commits into from
Feb 13, 2024
Merged

update.sh: parse GitHub API token from repository URL #16649

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c83172c
[update.sh] Parse local token in git remote.origin.url config
sazriel26 Dec 4, 2023
e24027e
Release Candidate 1
sazriel26 Dec 6, 2023
154a8c3
Release Candidate 2
sazriel26 Dec 6, 2023
a1e9e93
Update Library/Homebrew/cmd/update.sh
sazriel26 Dec 7, 2023
01d1e9b
New implementation through BASH regexes match
sazriel26 Jan 7, 2024
0728798
Fix missing ;
sazriel26 Jan 7, 2024
02a8de7
Fix brew style on update.sh
sazriel26 Jan 7, 2024
53c2618
Fix brew style on update.sh (2)
sazriel26 Jan 7, 2024
3619636
[Library/Homebrew/cmd/update.sh] Release Candidate for pull request
sazriel26 Jan 10, 2024
2833a21
[Library/Homebrew/cmd/update.sh] Add support for token provided w/o u…
sazriel26 Jan 11, 2024
4a37e81
Rewrite of branching tests in parsing URL
sazriel26 Jan 11, 2024
d9a38e7
Brew style --fix (applied)
sazriel26 Jan 11, 2024
3d0f543
Update Library/Homebrew/cmd/update.sh
sazriel26 Jan 11, 2024
835762b
Ready for review?
sazriel26 Jan 11, 2024
807b3e3
Update Library/Homebrew/cmd/update.sh
sazriel26 Jan 11, 2024
a1fbbc3
[update.sh] New test with protection of Homebrew directory
sazriel26 Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 23 additions & 9 deletions Library/Homebrew/cmd/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,6 @@ EOS
CURL_DISABLE_CURLRC_ARGS=()
fi

# HOMEBREW_GITHUB_API_TOKEN is optionally defined in the user environment.
# shellcheck disable=SC2153
if [[ -n "${HOMEBREW_GITHUB_API_TOKEN}" ]]
then
CURL_GITHUB_API_ARGS=("--header" "Authorization: token ${HOMEBREW_GITHUB_API_TOKEN}")
else
CURL_GITHUB_API_ARGS=()
fi

# only allow one instance of brew update
lock update

Expand Down Expand Up @@ -637,13 +628,36 @@ EOS
# the refspec ensures that the default upstream branch gets updated
(
UPSTREAM_REPOSITORY_URL="$(git config remote.origin.url)"
unset UPSTREAM_REPOSITORY
unset UPSTREAM_REPOSITORY_TOKEN

# HOMEBREW_UPDATE_FORCE and HOMEBREW_UPDATE_AUTO aren't modified here so ignore subshell warning.
# shellcheck disable=SC2030
if [[ "${UPSTREAM_REPOSITORY_URL}" == "https://github.com/"* ]]
then
UPSTREAM_REPOSITORY="${UPSTREAM_REPOSITORY_URL#https://github.com/}"
UPSTREAM_REPOSITORY="${UPSTREAM_REPOSITORY%.git}"
elif [[ "${DIR}" != "${HOMEBREW_REPOSITORY}" ]] &&
[[ "${UPSTREAM_REPOSITORY_URL}" =~ https://([[:alnum:]_:]+)@github.com/(.*)$ ]]
then
UPSTREAM_REPOSITORY="${BASH_REMATCH[2]%.git}"
UPSTREAM_REPOSITORY_TOKEN="${BASH_REMATCH[1]#*:}"
fi

if [[ -n "${UPSTREAM_REPOSITORY}" ]]
then
# UPSTREAM_REPOSITORY_TOKEN is parsed (if exists) from UPSTREAM_REPOSITORY_URL
# HOMEBREW_GITHUB_API_TOKEN is optionally defined in the user environment.
# shellcheck disable=SC2153
if [[ -n "${UPSTREAM_REPOSITORY_TOKEN}" ]]
then
CURL_GITHUB_API_ARGS=("--header" "Authorization: token ${UPSTREAM_REPOSITORY_TOKEN}")
elif [[ -n "${HOMEBREW_GITHUB_API_TOKEN}" ]]
then
CURL_GITHUB_API_ARGS=("--header" "Authorization: token ${HOMEBREW_GITHUB_API_TOKEN}")
else
CURL_GITHUB_API_ARGS=()
fi

if [[ "${DIR}" == "${HOMEBREW_REPOSITORY}" && -n "${HOMEBREW_UPDATE_TO_TAG}" ]]
then
Expand Down