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(). Update t #28157 #28682

Merged
merged 6 commits into from
Sep 4, 2018
+5 −19
Merged

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

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a4094c
Fix download agent search relying on throwing of Sys.which()
WillRam Aug 13, 2018
16898d7
change isempty to != nothing
WillRam Aug 17, 2018
058d348
change != to !==
WillRam Aug 17, 2018
0c53187
check file exists before deleting
WillRam Aug 20, 2018
3940b34
try to use curl before wget
WillRam Aug 20, 2018
85eec99
set rm to force and remove unused variable
WillRam Aug 21, 2018
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
18 changes: 3 additions & 15 deletions base/download.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,16 @@ if Sys.iswindows()
end
else
function download(url::AbstractString, filename::AbstractString)
global downloadcmd
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
end
end
if downloadcmd == "wget"
if !isempty(Sys.which("wget"))
Copy link
Member

Choose a reason for hiding this comment

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

shouldn't this be Sys.which("wget") !== nothing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, not sure where I got the idea that empty strings were being returned

try
run(`wget -O $filename $url`)
catch
rm(filename) # wget always creates a file
rethrow()
end
elseif downloadcmd == "curl"
elseif !isempty(Sys.which("curl"))
run(`curl -g -L -f -o $filename $url`)
elseif downloadcmd == "fetch"
elseif !isempty(Sys.which("fetch"))
run(`fetch -f $filename $url`)
else
error("no download agent available; install curl, wget, or fetch")
Expand Down