feat: support Unix-like OSes #1035
Merged
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
In general, `Platform.isUnix()` is preferred, which will not break Linux support.
miurahr
requested changes
May 22, 2024
src/org/omegat/util/Platform.java
Outdated
| @@ -87,6 +92,8 @@ public enum OsType { | |||
| isWindows = osName.startsWith("windows"); | |||
| isMacOS = osName.startsWith("mac"); | |||
| isLinux = osName.startsWith("linux"); | |||
| isBSD = osName.startsWith("bsd"); | |||
| isUnix = isLinux || isBSD; | |||
There was a problem hiding this comment.
isUnixLike is better abstraction. see https://github.com/search?q=isUnixLike&type=code
Suggested change
| isUnix = isLinux || isBSD; | |
| isUnixLike = isLinux || isBSD; |
There was a problem hiding this comment.
should I git push --force the fix, or simply commit another one with the fix?
There was a problem hiding this comment.
It is ok to simply commit another one. I will squash and merge when all is ok.
src/org/omegat/util/Platform.java
Outdated
Comment on lines
166
to
167
| public static boolean isUnix() { | ||
| return isUnix; |
There was a problem hiding this comment.
Suggested change
| public static boolean isUnix() { | |
| return isUnix; | |
| public static boolean isUnixLike() { | |
| return isUnixLike; |
src/org/omegat/util/Platform.java
Outdated
| @@ -107,7 +114,7 @@ public enum OsType { | |||
| isJava_17_orLater = (javaVersion >= toVersion(17, 0, 0, 0)); | |||
|
|
|||
| // UI toolkits | |||
| isKDE = (isLinux && System.getenv("KDE_FULL_SESSION") != null); | |||
| isKDE = (isUnix && System.getenv("KDE_FULL_SESSION") != null); | |||
There was a problem hiding this comment.
Suggested change
| isKDE = (isUnix && System.getenv("KDE_FULL_SESSION") != null); | |
| isKDE = (isUnixLike && System.getenv("KDE_FULL_SESSION") != null); |
src/org/omegat/util/Platform.java
Outdated
| @@ -61,6 +64,8 @@ public enum OsType { | |||
| public static final boolean isWindows; | |||
| public static final boolean isMacOS; | |||
| public static final boolean isLinux; | |||
| public static final boolean isBSD; | |||
| public static final boolean isUnix; | |||
There was a problem hiding this comment.
Suggested change
| public static final boolean isUnix; | |
| public static final boolean isUnixLike; |
src/org/omegat/util/StaticUtils.java
Outdated
| @@ -312,7 +312,7 @@ public static String getConfigDir() { | |||
| } | |||
| // Check for UNIX varieties | |||
| // Solaris is generally detected as SunOS | |||
| } else if (Platform.isLinux()) { | |||
| } else if (Platform.isUnix()) { | |||
There was a problem hiding this comment.
Suggested change
| } else if (Platform.isUnix()) { | |
| } else if (Platform.isUnixLike()) { |
|
built and tested on my machine. |
miurahr
approved these changes
May 24, 2024
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.
As discussed in 1746, here is the patch.
In general,
Platform.isUnix()is preferred, which will not break Linux support.isX11()was suggested. I did search in the code and the web.(Unix|UNIX)is used in several places in the code and the documentation. It looks to me thatUNIX(R)is used when referring to the registered trademark, andUnixwhen referring to Unix-like and Unix variants. Thus,isUnix()is used in the patch.Pull request type
Which ticket is resolved?
What does this PR change?
Other information
The build was successful, and I am using it.
xdg-openis working.