diff --git a/unix_setup.sh b/unix_setup.sh index d85f67c195dc41517d75af7c19bfb0edc63098ce..271565a08006f0c4ff0df80adcc7f904f6777642 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."