Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Arch_Check' into 'master'

Browse Source 
Improve OS-based Arch check

See merge request sheepitrenderfarm/client!150
This commit is contained in:
harlekin
2022-07-29 14:05:21 +00:00
parent 36b506aa6f 9fd8365ce2
commit 5553585f04
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/sheepit/client/os/Linux.java
View File

@@ -94,6 +94,17 @@ public class Linux extends OS {
return builder.start(); return builder.start();
} }
@Override public boolean isSupported() {
String arch = System.getProperty("os.arch").toLowerCase();
return
super.isSupported() &&
(
"amd64".equals(arch) ||
"x64".equals(arch) ||
"x86_64".equals(arch)
);
}
@Override public boolean getSupportHighPriority() { @Override public boolean getSupportHighPriority() {
try { try {
ProcessBuilder builder = new ProcessBuilder(); ProcessBuilder builder = new ProcessBuilder();

10
src/main/java/com/sheepit/client/os/Windows.java
View File

@@ -79,13 +79,21 @@ public class Windows extends OS {
@Override public boolean isSupported() { @Override public boolean isSupported() {
long buildNumber = Long.MIN_VALUE; long buildNumber = Long.MIN_VALUE;
String arch = System.getProperty("os.arch").toLowerCase();
try { try {
buildNumber = Long.parseLong(operatingSystem.getVersionInfo().getBuildNumber()); buildNumber = Long.parseLong(operatingSystem.getVersionInfo().getBuildNumber());
} }
catch(NumberFormatException e) { catch(NumberFormatException e) {
System.err.println("Windows::isSupported Failed to extract Windows build number: " + e); System.err.println("Windows::isSupported Failed to extract Windows build number: " + e);
} }
return super.isSupported() && buildNumber >= MINIMUM_SUPPORTED_BUILD; return
super.isSupported() &&
buildNumber >= MINIMUM_SUPPORTED_BUILD &&
(
"amd64".equals(arch) ||
"x64".equals(arch) ||
"x86_64".equals(arch)
);
} }
int getPriorityClass(int priority) { int getPriorityClass(int priority) {