improve kylin support for linuxos module #5873
Open
+23
−8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
waruqi
reviewed
Nov 23, 2024
| @@ -143,12 +143,11 @@ function linuxos.version() | |||
| if version == nil and os.isfile("/etc/os-release") then | |||
| local os_release = io.readfile("/etc/os-release") | |||
| if os_release then | |||
| os_release = os_release:trim():lower():split("\n") | |||
| for _, line in ipairs(os_release) do | |||
| os_release_lines = os_release:trim():lower():split("\n") | |||
waruqi
reviewed
Nov 23, 2024
| -- kylin case 2: | ||
| -- VERSION="4.0.2 (juniper)" | ||
| -- VERSION_ID="4.0.2" | ||
| if line:find("version_id=") and os_release:find("kylin", 1, true) then |
There was a problem hiding this comment.
lowercase or uppercase? and please use line:startswith
waruqi
reviewed
Nov 23, 2024
| line = line:sub(12) | ||
| version = semver.match(line) | ||
| if not version then | ||
| version = line:match("\"(.*)\"") |
waruqi
reviewed
Nov 23, 2024
| @@ -176,7 +191,7 @@ function linuxos.version() | |||
| -- get it from lsb release | |||
| if version == nil then | |||
| local lsb_release = linuxos._lsb_release() | |||
| if lsb_release and lsb_release:find("ubuntu", 1, true) then | |||
| if lsb_release and (lsb_release:find("ubuntu", 1, true) or lsb_release:find("kylin", 1, true)) then | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
i improve kylin support for linuxos module, making it more robust.