improve os checks in luvi libraries

luvit · Jul 3, 2024 · fc5eb49 · fc5eb49
1 parent e059e2c
commit fc5eb49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/lua/luvibundle.lua b/src/lua/luvibundle.lua
@@ -6,10 +6,9 @@ local pathJoin = luviPath.pathJoin
 local getenv = require('os').getenv
 
 local loadstring = loadstring or load
-local unpack     = unpack     or _G.table.unpack
+local unpack     = unpack     or table.unpack
 
-local tmpBase = luviPath.isWindows and (getenv("TMP") or uv.cwd()) or
-                                       (getenv("TMPDIR") or '/tmp')
+local tmpBase = getenv("TMPDIR") or getenv("TMP") or getenv("TEMP") or (uv.fs_access("/tmp", "r") and "/tmp") or uv.cwd()
 
 -- Bundle from folder on disk
 local function folderBundle(base)

diff --git a/src/lua/luvipath.lua b/src/lua/luvipath.lua
@@ -2,10 +2,10 @@ local luvi = require('luvi')
 local getPrefix, splitPath, joinParts
 
 local isWindows
-if _G.jit then
-  isWindows = _G.jit.os == "Windows"
+if pcall(require, 'jit') then
+  isWindows = require('jit').os == "Windows"
 else
-  isWindows = not not package.path:match("\\")
+  isWindows = not not (package.config:sub(1, 1) == "\\" or package.path:find("\\", 1, true) or package.cpath:find("\\", 1, true))
 end
 
 if isWindows then