diff options
| author | ruki <[email protected]> | 2017-05-19 09:02:14 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-05-19 09:02:14 +0800 |
| commit | a38978e6375226a2328c825f43ad09e4ecc3c066 (patch) | |
| tree | 54777382186c926e5053cd5494031d3fe7f1fd91 | |
| parent | e4ad50a4aca318850bad751c8372994d6a7d9f80 (diff) | |
improve os.tmpdir()
| -rw-r--r-- | xmake/core/base/os.lua | 14 | ||||
| -rw-r--r-- | xmake/platforms/checker.lua | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua index 8f3e32ecb..5aad87d26 100644 --- a/xmake/core/base/os.lua +++ b/xmake/core/base/os.lua @@ -411,8 +411,18 @@ end -- get the temporary directory function os.tmpdir() - -- generate and get a temporary directory - local tmpdir = path.join(os._tmpdir(), ".xmake") + -- attempt get user name + os._USER = os._USER or os.getenv("USER") + + -- get a temporary directory for each user + local tmpdir = os._tmpdir() + if os._USER and #os._USER > 0 then + tmpdir = path.join(tmpdir, ".xmake_" .. os._USER) + else + tmpdir = path.join(tmpdir, ".xmake") + end + + -- ensure this directory exist if not os.isdir(tmpdir) then os.mkdir(tmpdir) end diff --git a/xmake/platforms/checker.lua b/xmake/platforms/checker.lua index 32124ec97..20465276e 100644 --- a/xmake/platforms/checker.lua +++ b/xmake/platforms/checker.lua @@ -194,10 +194,10 @@ function check_xcode_sdkver(config) config.set("xcode_sdkver", xcode_sdkver) -- trace - cprint("checking for the Xcode SDK version for %s ... ${green}%s", plat, xcode_sdkver) + cprint("checking for the Xcode SDK version for %s ... ${green}%s", config.get("plat"), xcode_sdkver) else -- failed - cprint("checking for the Xcode SDK version for %s ... ${red}no", plat) + cprint("checking for the Xcode SDK version for %s ... ${red}no", config.get("plat")) cprint("${bright red}please run:") cprint("${red} - xmake config --xcode_sdkver=xxx") cprint("${red}or - xmake global --xcode_sdkver=xxx") |