mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
fix: validate content pack dependency versions
This commit is contained in:
parent
bb6bd27b94
commit
28b849229c
1 changed files with 7 additions and 2 deletions
|
|
@ -208,7 +208,7 @@ function Version.__less(ver1, ver2)
|
||||||
end
|
end
|
||||||
|
|
||||||
function Version.__greater_or_equal(ver1, ver2)
|
function Version.__greater_or_equal(ver1, ver2)
|
||||||
return not Version.__less(ver2, ver1)
|
return not Version.__less(ver1, ver2)
|
||||||
end
|
end
|
||||||
|
|
||||||
function Version.__less_or_equal(ver1, ver2)
|
function Version.__less_or_equal(ver1, ver2)
|
||||||
|
|
@ -227,6 +227,11 @@ function Version.compare(op, ver1, ver2)
|
||||||
ver1 = string.split(ver1, ".")
|
ver1 = string.split(ver1, ".")
|
||||||
ver2 = string.split(ver2, ".")
|
ver2 = string.split(ver2, ".")
|
||||||
|
|
||||||
|
for i = 1, 3 do
|
||||||
|
ver1[i] = tonumber(ver1[i]) or 0
|
||||||
|
ver2[i] = tonumber(ver2[i]) or 0
|
||||||
|
end
|
||||||
|
|
||||||
local comparison_func = Version.operators[op];
|
local comparison_func = Version.operators[op];
|
||||||
|
|
||||||
if comparison_func then
|
if comparison_func then
|
||||||
|
|
@ -252,7 +257,7 @@ end
|
||||||
|
|
||||||
local function compare_version(op, dependent_version, actual_version)
|
local function compare_version(op, dependent_version, actual_version)
|
||||||
if Version.matches_pattern(dependent_version) and Version.matches_pattern(actual_version) then
|
if Version.matches_pattern(dependent_version) and Version.matches_pattern(actual_version) then
|
||||||
return Version.compare(op, dep_ver, actual_version)
|
return Version.compare(op, actual_version, dependent_version)
|
||||||
elseif dependent_version == "*" or dependent_version == actual_version then
|
elseif dependent_version == "*" or dependent_version == actual_version then
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue