Merge pull request #6835 from xmake-io/package

fix package extension

Author: waruqi

xmake/modules/private/action/require/impl/actions/download.lua

@@ -34,6 +34,17 @@ import("net.proxy")
 import("devel.git")
 import("utils.archive")
 
+-- get url extension
+function _url_extension(url)
+    local extension = archive.extension(url)
+    if extension == "" then
+        -- maybe non-archive file, e.g. .exe, .sh, ..
+        local urlpath = url:split('?', {plain = true})[1]
+        extension = path.extension(urlpath)
+    end
+    return extension
+end
+
 -- checkout codes from git
 function _checkout(package, url, sourcedir, opt)
     opt = opt or {}
@@ -153,7 +164,7 @@ function _download(package, url, sourcedir, opt)
     if not packagefile then
         packagefile = url_filename(url)
         if not os.isfile(packagefile) then -- we need to be compatible with the old file names
-            packagefile = package:name() .. "-" .. package:version_str() .. archive.extension(packagefile)
+            packagefile = package:name() .. "-" .. package:version_str() .. _url_extension(packagefile)
         end
     end
 
@@ -181,7 +192,7 @@ function _download(package, url, sourcedir, opt)
             os.cp(url, packagefile)
         else
             local localfile
-            local searchnames = {package:name() .. "-" .. package:version_str() .. archive.extension(url),
+            local searchnames = {package:name() .. "-" .. package:version_str() .. _url_extension(url),
                                  packagefile}
 
             -- match github name mangling https://github.com/xmake-io/xmake/issues/1343
@@ -267,6 +278,7 @@ function _download(package, url, sourcedir, opt)
         raise(errors or string.format("cannot extract %s, maybe missing extractor or invalid package file!", packagefile))
     else
         -- if it is not archive file, we only need to create empty source directory and use package:originfile()
+        -- e.g. .exe, .sh
         os.tryrm(sourcedir)
         os.mkdir(sourcedir)
     end
@@ -424,7 +436,7 @@ function main(package, opt)
                                     searchnames:insert(package:name() .. archive.extension(url_failed))
                                     searchnames:insert(path.basename(url_filename(url_failed)))
                                 else
-                                    local extension = archive.extension(url_failed)
+                                    local extension = _url_extension(url_failed)
                                     if extension then
                                         searchnames:insert(package:name() .. "-" .. package:version_str() .. extension)
                                     end

xmake/modules/utils/archive/extension.lua

@@ -22,9 +22,10 @@
 import("core.base.hashset")
 
 -- get the archive extension
-function main(archivefile)
+function main(url)
+    local urlpath = url:split('?', {plain = true})[1]
     local extension = ""
-    local filename = path.filename(archivefile)
+    local filename = path.filename(urlpath)
     local extensionset = hashset.from({
         ".xmz", -- xmake compression format
         ".zip", ".7z", ".gz", ".xz", ".zst", ".tgz",