From b9736d97e380c122cebec5b469470a8c0d76c15d Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 22 Dec 2016 09:06:03 -0500 Subject: [PATCH] Add is64Bit() check --- brut.j.util/src/main/java/brut/util/OSDetection.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/brut.j.util/src/main/java/brut/util/OSDetection.java b/brut.j.util/src/main/java/brut/util/OSDetection.java index 787bffa8..1157c8d7 100644 --- a/brut.j.util/src/main/java/brut/util/OSDetection.java +++ b/brut.j.util/src/main/java/brut/util/OSDetection.java @@ -18,17 +18,22 @@ package brut.util; public class OSDetection { private static String OS = System.getProperty("os.name").toLowerCase(); + private static String Bit = System.getProperty("sun.arch.data.model").toLowerCase(); public static boolean isWindows() { - return (OS.indexOf("win") >= 0); + return (OS.contains("win")); } public static boolean isMacOSX() { - return (OS.indexOf("mac") >= 0); + return (OS.contains("mac")); } public static boolean isUnix() { - return (OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0 || (OS.indexOf("sunos") >= 0)); + return (OS.contains("nix") || OS.contains("nux") || OS.contains("aix") || (OS.contains("sunos"))); + } + + public static boolean is64Bit() { + return Bit.equalsIgnoreCase("64"); } public static String returnOS() {