From 8ca5a5db800c933f2da2a7cf7ece88fd620584a9 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 22 Nov 2022 15:10:59 -0500
Subject: [PATCH] fix to get right tsk libs

---
 unix_setup.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/unix_setup.sh b/unix_setup.sh
index d85f67c195..271565a080 100644
--- a/unix_setup.sh
+++ b/unix_setup.sh
@@ -73,15 +73,15 @@ fi
 
 # Verify Sleuth Kit Java was installed
 echo -n "Checking for Sleuth Kit Java bindings..."
-if [ -f "/usr/share/java/sleuthkit-$TSK_VERSION.jar" ]; then
+if [ -n $TSK_JAVA_LIB_PATH ] && [ -f "$TSK_JAVA_LIB_PATH/sleuthkit-$TSK_VERSION.jar" ]; then
+    sleuthkit_jar_filepath=$TSK_JAVA_LIB_PATH/sleuthkit-$TSK_VERSION.jar
+    echo "found in $(dirname $sleuthkit_jar_filepath)"
+elif [ -f "/usr/share/java/sleuthkit-$TSK_VERSION.jar" ]; then
     sleuthkit_jar_filepath=/usr/share/java/sleuthkit-$TSK_VERSION.jar
     echo "found in $(dirname $sleuthkit_jar_filepath)"
 elif [ -f "/usr/local/share/java/sleuthkit-$TSK_VERSION.jar" ]; then
     sleuthkit_jar_filepath=/usr/local/share/java/sleuthkit-$TSK_VERSION.jar
     echo "found in $(dirname $sleuthkit_jar_filepath)"
-elif [ -n $TSK_JAVA_LIB_PATH ] && [ -f "$TSK_JAVA_LIB_PATH/sleuthkit-$TSK_VERSION.jar" ]; then
-    sleuthkit_jar_filepath=$TSK_JAVA_LIB_PATH/sleuthkit-$TSK_VERSION.jar
-    echo "found in $(dirname $sleuthkit_jar_filepath)"
 else
     echo "ERROR: sleuthkit-$TSK_VERSION.jar not found in /usr/share/java/, /usr/local/share/java/, or the environment variable: 'TSK_JAVA_LIB_PATH': \"$TSK_JAVA_LIB_PATH\"."
     echo "Please install the Sleuth Kit Java bindings file."
-- 
GitLab