Fix some issues reported on Slack (#243)

* Fix `FileSource` incorrectly trying to replace `srcdir`

Sometimes, a user tries to download a file that is an archive but it
accidentally gets seen as a `FileSource` due to our imperfect archive
detection. Rather than erroring out here with a bad `cp()` invocation,
automatically plop the file into `srcdir`, and allow the build to
continue.

* Check `path` instead of `url` for `archive_extensions`

This allows us to perform a bit of URL cleaning to drop things like
`?raw=true` at the end of URLs from GitHub, for instance.  Best to check
the given destination path name, rather than the original URL name.

* Update sources.jl

Author: staticfloat

src/Prefix.jl

@@ -297,6 +297,9 @@ function setup(source::SetupSource{ArchiveSource}, targetdir, verbose; tar_flags
 end
 
 function setup(source::SetupSource{FileSource}, target, verbose)
+    if isdir(target)
+        target = joinpath(target, basename(source.path))
+    end
     if verbose
         @info "Copying $(basename(source.path)) in $(basename(target))..."
     end

src/Sources.jl

@@ -114,7 +114,7 @@ SetupSource{T}(path::String, hash::String, target::String) where {T} =
 function SetupSource(url::String, path::String, hash::String, target::String)
     if endswith(url, ".git")
         return SetupSource{GitSource}(path, hash, target)
-    elseif any(endswith(url, ext) for ext in archive_extensions)
+    elseif any(endswith(path, ext) for ext in archive_extensions)
         return SetupSource{ArchiveSource}(path, hash, target)
     else
         return SetupSource{FileSource}(path, hash, target)

test/sources.jl

@@ -11,10 +11,10 @@ using JSON
     @test FileSource("https://curl.haxx.se/ca/cacert-2020-01-01.pem", "adf770dfd574a0d6026bfaa270cb6879b063957177a991d453ff1d302c02081f").filename == "cacert-2020-01-01.pem"
     @test FileSource("https://curl.haxx.se/ca/cacert-2020-01-01.pem", "adf770dfd574a0d6026bfaa270cb6879b063957177a991d453ff1d302c02081f"; filename="cacert.pem").filename == "cacert.pem"
 
-    @test SetupSource("https://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.gz", "", "", "") isa SetupSource{ArchiveSource}
-    @test SetupSource("https://ftp.gnu.org/gnu/wget/wget-1.20.3.zip", "", "", "")    isa SetupSource{ArchiveSource}
-    @test SetupSource("https://github.com/jedisct1/libsodium.git", "", "", "")       isa SetupSource{GitSource}
-    @test SetupSource("https://curl.haxx.se/ca/cacert-2020-01-01.pem", "", "", "")   isa SetupSource{FileSource}
+    @test SetupSource("https://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.gz", "wget-1.20.3.tar.gz", "", "") isa SetupSource{ArchiveSource}
+    @test SetupSource("https://ftp.gnu.org/gnu/wget/wget-1.20.3.zip", "wget-1.20.3.zip", "", "")    isa SetupSource{ArchiveSource}
+    @test SetupSource("https://github.com/jedisct1/libsodium.git", "libsodium.git", "", "")       isa SetupSource{GitSource}
+    @test SetupSource("https://curl.haxx.se/ca/cacert-2020-01-01.pem", "cacert-2020-01-01.pem", "", "")   isa SetupSource{FileSource}
 
     @testset "Download and setup" begin
         mktempdir() do dir