CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-28 23:31:43 +12:00
Code Issues Projects Releases Packages Wiki Activity

Properly fix os type detection for windows on different locales

Browse source
This commit is contained in:
crschnick 2023-04-01 12:45:11 +00:00
parent b1f2272fc2
commit e4a85573c0
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/src/main/java/io/xpipe/core/process/OsType.java
View file

@ -2,6 +2,7 @@ package io.xpipe.core.process;
import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
public interface OsType {
@ -36,7 +37,8 @@ public interface OsType {
@Override
public String getHomeDirectory(ShellControl pc) throws Exception {
return pc.executeStringSimpleCommand(pc.getShellDialect().getPrintEnvironmentVariableCommand("USERPROFILE"));
return pc.executeStringSimpleCommand(
pc.getShellDialect().getPrintEnvironmentVariableCommand("USERPROFILE"));
}
@Override
@ -59,9 +61,17 @@ public interface OsType {
@Override
public String determineOperatingSystemName(ShellControl pc) throws Exception {
var properties = getProperties(pc);
return properties.getOrDefault("OS Name", "Windows") + " "
+ properties.getOrDefault("OS Version", "?").split(" ")[0];
return pc.executeStringSimpleCommand("wmic os get Caption")
.lines()
.skip(1)
.collect(Collectors.joining())
.trim()
+ " "
+ pc.executeStringSimpleCommand("wmic os get Version")
.lines()
.skip(1)
.collect(Collectors.joining())
.trim();
}
}