From 8cf70572055c6b479145d2ee87add9435eec5fec Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 24 Jul 2021 00:50:47 +0800 Subject: fix download --- xmake/modules/private/action/require/impl/actions/download.lua | 2 +- .../modules/private/action/require/impl/actions/download_resources.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/modules/private/action/require/impl/actions/download.lua b/xmake/modules/private/action/require/impl/actions/download.lua index 48c77d725..bee421052 100644 --- a/xmake/modules/private/action/require/impl/actions/download.lua +++ b/xmake/modules/private/action/require/impl/actions/download.lua @@ -83,7 +83,7 @@ function _checkout(package, url, sourcedir, url_alias) git.checkout(revision, {repodir = packagedir}) -- update all submodules - if os.isfile(".gitmodules") then + if os.isfile(path.join(packagedir, ".gitmodules")) then git.submodule.update({init = true, recursive = true, longpaths = longpaths, repodir = packagedir}) end end diff --git a/xmake/modules/private/action/require/impl/actions/download_resources.lua b/xmake/modules/private/action/require/impl/actions/download_resources.lua index 67fcf0923..fa115c04a 100644 --- a/xmake/modules/private/action/require/impl/actions/download_resources.lua +++ b/xmake/modules/private/action/require/impl/actions/download_resources.lua @@ -68,7 +68,7 @@ function _checkout(package, resource_name, resource_url, resource_revision) git.checkout(resource_revision, {repodir = resourcedir}) -- update all submodules - if os.isfile(".gitmodules") then + if os.isfile(path.join(resourcedir, ".gitmodules")) then git.submodule.update({init = true, recursive = true, longpaths = longpaths, repodir = resourcedir}) end end -- cgit v1.3.1