Skip to content

Commit

Permalink
fix(version): properly compare minor/patch semver
Browse files Browse the repository at this point in the history
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
  • Loading branch information
thelindat committed Aug 23, 2022
1 parent 1ea4b16 commit bdb88e7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
10 changes: 4 additions & 6 deletions resource/version/server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ function lib.versionCheck(repository)
local latestVersion = response.tag_name:match('%d%.%d+%.%d+')
if not latestVersion or latestVersion == currentVersion then return end

local cv = { string.strsplit('.', currentVersion) }
local lv = { string.strsplit('.', latestVersion) }
local cMajor, cMinor = string.strsplit('.', currentVersion, 2)
local lMajor, lMinor = string.strsplit('.', latestVersion, 2)

for i = 1, #cv do
if tonumber(cv[i]) < tonumber(lv[i]) then
return print(('^3An update is available for %s (current version: %s)\r\n%s^0'):format(resource, currentVersion, response.html_url))
end
if tonumber(cMajor) < tonumber(lMajor) or tonumber(cMinor) < tonumber(lMinor) then
return print(('^3An update is available for %s (current version: %s)\r\n%s^0'):format(resource, currentVersion, response.html_url))
end
end, 'GET')
end)
Expand Down
18 changes: 8 additions & 10 deletions resource/version/shared.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 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
local cMajor, cMinor = string.strsplit('.', currentVersion, 2)
local mMajor, mMinor = string.strsplit('.', minimumVersion, 2)

return false, msg
local msg = ("^1%s requires version '%s' of '%s' (current version: %s)^0"):format(GetInvokingResource() or GetCurrentResourceName(), minimumVersion, resource, currentVersion)
if tonumber(cMajor) < tonumber(mMajor) or tonumber(cMinor) < tonumber(mMinor) then
if printMessage then
return print(msg)
end

return false, msg
end
end

Expand Down

0 comments on commit bdb88e7

Please sign in to comment.