dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now use version property instead of CLI parsing

Browse Source
This commit is contained in:
nathan 2017-02-27 12:55:26 +01:00
parent cb67faf901
commit b336b92be1
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/dorkbox/util/OSUtil.java
View File

@ -76,46 +76,25 @@ class OSUtil {
* *
* Windows Server 2016 10.0.14393 (2016-10-12) * Windows Server 2016 10.0.14393 (2016-10-12)
* *
* @return the [major][minor][patch] version of windows, ie: Windows Version 10.0.10586 -> [10][0][10586] * @return the [major][minor] version of windows, ie: Windows Version 10.0.10586 -> [10][0]
*/ */
public static public static
int[] getVersion() { int[] getVersion() {
int[] version = new int[3]; int[] version = new int[2];
version[0] = 0; version[0] = 0;
version[1] = 0; version[1] = 0;
version[2] = 0;
if (!OS.isWindows()) { if (!OS.isWindows()) {
return version; return version;
} }
try { try {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(8196); String output = System.getProperty("os.version");
PrintStream outputStream = new PrintStream(byteArrayOutputStream); String[] split = output.split("\\.",-1);
// cmd.exe /c ver if (split.length <= 2) {
final ShellProcessBuilder shellVersion = new ShellProcessBuilder(outputStream); for (int i = 0; i < split.length; i++) {
shellVersion.setExecutable("cmd.exe"); version[i] = Integer.parseInt(split[i]);
shellVersion.addArgument("/c");
shellVersion.addArgument("ver");
shellVersion.start();
String output = ShellProcessBuilder.getOutput(byteArrayOutputStream);
if (!output.isEmpty()) {
// should be: Microsoft Windows [Version 10.0.10586] or something
if (output.contains("ersion ")) {
int beginIndex = output.indexOf("ersion ") + 7;
int endIndex = output.lastIndexOf("]");
String versionString = output.substring(beginIndex, endIndex);
String[] split = versionString.split("\\.",-1);
if (split.length <= 3) {
for (int i = 0; i < split.length; i++) {
version[i] = Integer.parseInt(split[i]);
}
}
} }
} }
} catch (Throwable ignored) { } catch (Throwable ignored) {