From 5c179a8f0fb973ec8ab989a5610cb5c2686a4938 Mon Sep 17 00:00:00 2001
From: Jeff Wallace <wallace.je@husky.neu.edu>
Date: Wed, 18 Sep 2013 13:37:20 -0400
Subject: [PATCH] Added file that should have been included in last commit
---
.../src/org/sleuthkit/datamodel/LibraryUtils.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java b/bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java
index 529b343c3..096c5b866 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java
@@ -64,12 +64,10 @@ public String getLibName() {
*/
public static String getPlatform() {
String os = System.getProperty("os.name").toLowerCase();
- if(os.contains("win")) {
+ if(LibraryUtils.isWindows()) {
os = "win";
- } else if(os.contains("mac")) {
+ } else if(LibraryUtils.isMac()) {
os = "mac";
- } else {
- os = "unix";
}
// os.arch represents the architecture of the JVM, not the os
String arch = System.getProperty("os.arch");
@@ -94,6 +92,15 @@ private static boolean isMac() {
return System.getProperty("os.name").toLowerCase().contains("mac");
}
+ /**
+ * Is the platform Linux?
+ *
+ * @return
+ */
+ public static boolean isLinux() {
+ return System.getProperty("os.name").equals("Linux");
+ }
+
/**
* Attempt to extract and load the specified library.
*
--
GitLab