diff --git a/Core/build.xml b/Core/build.xml
index 655e756c25..9fb2bedd6e 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -6,7 +6,8 @@
Builds, tests, and runs the project org.sleuthkit.autopsy.core
-
+
+
@@ -18,8 +19,7 @@
-
-
+
@@ -54,8 +54,8 @@
-
+
+
+
diff --git a/build.xml b/build.xml
index 70ec4cb290..396268f50e 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
Builds the module suite Autopsy 4.
-
+
@@ -90,7 +90,7 @@
-
+
diff --git a/preinstall.sh b/unix_setup.sh
similarity index 80%
rename from preinstall.sh
rename to unix_setup.sh
index 2c1088fabd..41c57355de 100644
--- a/preinstall.sh
+++ b/unix_setup.sh
@@ -8,10 +8,10 @@ else
echo "run the command: sudo apt-get install testdisk"
exit 1
fi
-VERSION=4.6.0
-sleuthkit_jar_filepath=/usr/share/java/sleuthkit-$VERSION.jar;
-ext_jar_filepath=$PWD/autopsy/modules/ext/sleuthkit-postgresql-$VERSION.jar;
-if [[ -f "$sleuthkit_jar_filepath" ]] && [[ -f "$ext_jar_filepath" ]]; then
+TSK_VERSION=4.6.0
+sleuthkit_jar_filepath=/usr/share/java/sleuthkit-$TSK_VERSION.jar;
+ext_jar_filepath=$PWD/autopsy/modules/ext/sleuthkit-postgresql-$TSK_VERSION.jar;
+if [[ -f "$sleuthkit_jar_filepath" ]]; then
echo "$sleuthkit_jar_filepath found"
echo "copying $sleuthkit_jar_filepath to the autopsy directory"
echo "deleting $ext_jar_filepath"
@@ -31,7 +31,6 @@ if [[ -f "$sleuthkit_jar_filepath" ]] && [[ -f "$ext_jar_filepath" ]]; then
fi
else
echo "$sleuthkit_jar_filepath not found, please install the sleuthkit-java.deb file"
- echo "run the command: sudo apt install ./sleuthkit-java_4.6.0-1_amd64.deb inside the debian file directory"
exit 1
fi