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

Fix download agent search relying on throwing of Sys.which() #28157

Closed
wants to merge 1 commit into from
Closed

Fix download agent search relying on throwing of Sys.which() #28157

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
15 changes: 5 additions & 10 deletions base/download.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,12 @@ if Sys.iswindows()
else
function download(url::AbstractString, filename::AbstractString)
global downloadcmd
download_agents = ("curl", "wget", "fetch")
if downloadcmd === nothing
for checkcmd in ("curl", "wget", "fetch")
try
# Sys.which() will throw() if it can't find `checkcmd`
Sys.which(checkcmd)
downloadcmd = checkcmd
break
catch
end
try
downloadcmd = basename(something(Sys.which.(download_agents)...))
catch
error("no download agent available; install curl, wget, or fetch")
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be better (and not longer) to write this as a loop, rather than obscuring all errors with this message

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What else can throw here except something(nothing)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree it would be nicer to do without try/catch entirely, since that's now possible here.

end
if downloadcmd == "wget"
Expand All @@ -48,8 +45,6 @@ else
run(`curl -g -L -f -o $filename $url`)
elseif downloadcmd == "fetch"
run(`fetch -f $filename $url`)
else
error("no download agent available; install curl, wget, or fetch")
end
filename
end
Expand Down