diff options
| author | ruki <[email protected]> | 2019-05-11 21:34:40 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-05-11 21:34:40 +0800 |
| commit | 80ec33c28e6f8d0f38b41f5030df9249953e300a (patch) | |
| tree | 9ab75337af18de1ad03d4e0a1e54b12fa62fd9bf | |
| parent | ffa81cffcd6788d70b05a96cd5cc9ab2bbc52ce5 (diff) | |
improve extract archive
| -rw-r--r-- | xmake/modules/utils/archive/extract.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/utils/archive/extract.lua b/xmake/modules/utils/archive/extract.lua index b9233b40f..adf9a5899 100644 --- a/xmake/modules/utils/archive/extract.lua +++ b/xmake/modules/utils/archive/extract.lua @@ -119,7 +119,7 @@ function _extract_using_7z(archivefile, outputdir, extension, opt) -- continue to extract *.tar file if outputdir_old then - local tarfile = find_file("*.tar", outputdir) + local tarfile = find_file("**.tar", outputdir) if tarfile and os.isfile(tarfile) then return _extract(tarfile, outputdir_old, ".tar", {_extract_using_tar, _extract_using_7z}, opt) end @@ -176,7 +176,7 @@ function _extract_using_gzip(archivefile, outputdir, extension, opt) -- continue to extract *.tar file if outputdir_old then - local tarfile = find_file("*.tar", outputdir) + local tarfile = find_file("**.tar", outputdir) if tarfile and os.isfile(tarfile) then return _extract(tarfile, outputdir_old, ".tar", {_extract_using_tar, _extract_using_7z}, opt) end @@ -233,7 +233,7 @@ function _extract_using_xz(archivefile, outputdir, extension, opt) -- continue to extract *.tar file if outputdir_old then - local tarfile = find_file("*.tar", outputdir) + local tarfile = find_file("**.tar", outputdir) if tarfile and os.isfile(tarfile) then return _extract(tarfile, outputdir_old, ".tar", {_extract_using_tar, _extract_using_7z}, opt) end @@ -288,7 +288,7 @@ function _extract_using_unzip(archivefile, outputdir, extension, opt) -- continue to extract *.tar file if outputdir_old then - local tarfile = find_file("*.tar", outputdir) + local tarfile = find_file("**.tar", outputdir) if tarfile and os.isfile(tarfile) then return _extract(tarfile, outputdir_old, ".tar", {_extract_using_tar, _extract_using_7z}, opt) end @@ -359,8 +359,8 @@ function main(archivefile, outputdir, opt) , [".tgz"] = {_extract_using_tar, _extract_using_7z} , [".bz2"] = {_extract_using_tar, _extract_using_7z} , [".tar"] = {_extract_using_tar, _extract_using_7z} - , [".tar.gz"] = {_extract_using_tar, _extract_using_gzip, _extract_using_7z} - , [".tar.xz"] = {_extract_using_tar, _extract_using_xz, _extract_using_7z} + , [".tar.gz"] = {_extract_using_tar, _extract_using_7z, _extract_using_gzip} + , [".tar.xz"] = {_extract_using_tar, _extract_using_7z, _extract_using_xz} , [".tar.bz2"] = {_extract_using_tar, _extract_using_7z} } |