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

Update rustup-init to detect tls1.2 for curl 7.73+ (Fixes #2603) #2604

Merged
merged 1 commit into from
Dec 13, 2020
Merged

Update rustup-init to detect tls1.2 for curl 7.73+ (Fixes #2603) #2604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion rustup-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,13 @@ check_help_for() {
_cmd="$1"
shift

local _category
if "$_cmd" --help | grep -q 'For all options use the manual or "--help all".'; then
_category="all"
else
_category=""
fi

case "$_arch" in

# If we're running on OS-X, older than 10.13, then we always
Expand All @@ -508,7 +515,7 @@ check_help_for() {
esac

for _arg in "$@"; do
if ! "$_cmd" --help | grep -q -- "$_arg"; then
if ! "$_cmd" --help $_category | grep -q -- "$_arg"; then
return 1
fi
done
Expand Down