fix(version): properly compare minor/patch semver

Comparing "2.7.4" to "2.10.1" would compare each number, i.e.
2 = 2,
7 < 10,
4 > 1
Instead compare the major (2 v 2), then minor.patch (7.4 v 10.1).
where doka to do my math
This commit is contained in:
Linden
2022-08-23 19:29:45 +10:00
parent 1ea4b16c8b
commit bdb88e74c5
2 changed files with 12 additions and 16 deletions

View File

@@ -2,18 +2,16 @@ function lib.checkDependency(resource, minimumVersion, printMessage)
local currentVersion = GetResourceMetadata(resource, 'version', 0):match('%d%.%d+%.%d+')
if currentVersion ~= minimumVersion then
local cv = { string.strsplit('.', currentVersion) }
local mv = { string.strsplit('.', minimumVersion) }
local cMajor, cMinor = string.strsplit('.', currentVersion, 2)
local mMajor, mMinor = string.strsplit('.', minimumVersion, 2)
local msg = ("^1%s requires version '%s' of '%s' (current version: %s)^0"):format(GetInvokingResource() or GetCurrentResourceName(), minimumVersion, resource, currentVersion)
for i = 1, #cv do
if tonumber(cv[i]) < tonumber(mv[i]) then
if printMessage then
return print(msg)
end
return false, msg
if tonumber(cMajor) < tonumber(mMajor) or tonumber(cMinor) < tonumber(mMinor) then
if printMessage then
return print(msg)
end
return false, msg
end
end