[crush] Update to latest version.

master
Lorenzo Cogotti 2 years ago
parent 2b16d66b14
commit 7e8859e240

@ -7,6 +7,33 @@
local io = require 'io' local io = require 'io'
local os = require 'os' local os = require 'os'
-- Lua version check
local function check_version()
-- Generic Lua version check - 5.2 required
if _VERSION then
local maj, min = _VERSION:match("Lua (%d+)%.(%d+)")
if maj and min then
maj, min = tonumber(maj), tonumber(min)
if maj > 5 or (maj == 5 and min >= 2) then
return true
end
end
end
-- LuaJIT check - 2.0.0 required (technically 2.0.0_beta11)
if jit and jit.version_num and jit.version_num >= 20000 then
return true
end
return false
end
if not check_version() then
error("Unsupported Lua version!\nSorry, crush requires Lua 5.2 or LuaJIT 2.0.0.")
end
-- System specific functions -- System specific functions
-- --
-- Portions of this code are based on work from the LuaRocks project. -- Portions of this code are based on work from the LuaRocks project.
@ -24,10 +51,6 @@ local chdir
local mkdir local mkdir
if is_windows then if is_windows then
-- ---------------
-- NOTE: untested!
-- ---------------
-- local -- local
function is_directory(path) function is_directory(path)
local fh, _, code = io.open(path, 'r') local fh, _, code = io.open(path, 'r')
@ -178,7 +201,11 @@ local function fetch(dep)
fullcmd = chdir("lib", quiet(cmd)) fullcmd = chdir("lib", quiet(cmd))
end end
if not os.execute(fullcmd) then -- On success, os.execute() returns:
-- true on regular Lua
-- 0 on LuaJIT (actual OS error code)
local code = os.execute(fullcmd)
if code ~= true and code ~= 0 then
error(dep.name..": Dependency fetch failed ("..cmd..").") error(dep.name..": Dependency fetch failed ("..cmd..").")
end end
end end

Loading…
Cancel
Save