Merge pull request #686 from cryptomilk/asn-fix

fix: Use os_uname() to check for Linux
luvit · Jan 17, 2024 · 08b9790 · 08b9790
2 parents 77f1bd3 + 7877a22
commit 08b9790
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/deps/lua.cmake b/deps/lua.cmake
@@ -118,6 +118,7 @@ add_executable(lua ${LUA_DIR}/lua.c)
 IF(WIN32)
   target_link_libraries(lua lualib)
 ELSE()
+  target_compile_definitions(lualib PRIVATE LUA_USE_POSIX)
   target_link_libraries(lua lualib ${LIBS})
   SET_TARGET_PROPERTIES(lua PROPERTIES ENABLE_EXPORTS ON)
 ENDIF(WIN32)

diff --git a/lib/utils.lua b/lib/utils.lua
@@ -12,17 +12,41 @@ else
   usecolors = false
 end
 
+function utils.uvVersionGEQ(min_version)
+  if not min_version then return true end
+  local min_version_num = min_version
+  if type(min_version) == "string" then
+    local version_parts = {}
+    for part in min_version:gmatch("%d+") do
+      table.insert(version_parts, tonumber(part))
+    end
+    assert(#version_parts == 3, "malformed version string: " .. min_version)
+    min_version_num = version_parts[1]*0x10000 + version_parts[2]*0x100 + version_parts[3]
+  end
+  return uv.version() >= min_version_num
+end
+
 if _G.jit and _G.jit.os then
   -- Luajit provides explicit platform detection
   utils.isWindows = _G.jit.os == "Windows"
   utils.isLinux = _G.jit.os == 'Linux'
 else
   -- Normal lua will only have \ for path separator on windows.
   utils.isWindows = package.config:find("\\") and true or false
+  utils.isLinux = false
+
   if not utils.isWindows then
-    local _os = os.getenv('RUNNER_OS') or os.getenv('OSTYPE')
-    if (_os and _os:lower():match('linux')) then
-      utils.isLinux = true
+    -- Use os_uname if it's available, fallback to popen
+    if utils.uvVersionGEQ("1.25.0") then
+      local uname = uv.os_uname()
+      utils.isLinux = uname.sysname:lower() == 'linux'
+    else
+      local popen_handle = io.popen('uname -s')
+      if popen_handle then
+        local uname_os = assert(popen_handle:read('*a'))
+        popen_handle:close()
+        utils.isLinux = uname_os:lower() == 'linux'
+      end
     end
   end
 end
@@ -176,19 +200,5 @@ function utils.prettyPrint(...)
   print(table.concat(arguments, "\t"))
 end
 
-function utils.uvVersionGEQ(min_version)
-  if not min_version then return true end
-  local min_version_num = min_version
-  if type(min_version) == "string" then
-    local version_parts = {}
-    for part in min_version:gmatch("%d+") do
-      table.insert(version_parts, tonumber(part))
-    end
-    assert(#version_parts == 3, "malformed version string: " .. min_version)
-    min_version_num = version_parts[1]*0x10000 + version_parts[2]*0x100 + version_parts[3]
-  end
-  return uv.version() >= min_version_num
-end
-
 return utils