mirror of
https://github.com/CommunityOx/ox_lib.git
synced 2026-08-17 06:56:03 +01:00
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:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user