diff --git a/Core/build.xml b/Core/build.xml
index 9fcf7d5ace..68f69bd765 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -6,7 +6,8 @@
Builds, tests, and runs the project org.sleuthkit.autopsy.core
-
+
+
@@ -17,9 +18,7 @@
-
-
-
+
@@ -57,8 +56,8 @@
-
+
+
+
diff --git a/build.xml b/build.xml
index ef5ad87980..ae2035fc1b 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
Builds the module suite Autopsy 4.
-
+
@@ -79,6 +79,10 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -286,10 +297,6 @@
-
-
-
-
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 781ec2c83b..0cb7b69b5e 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -6,8 +6,8 @@ app.name=${branding.token}
### if left unset, version will default to today's date
app.version=4.6.0
### build.type must be one of: DEVELOPMENT, RELEASE
-#build.type=RELEASE
-build.type=DEVELOPMENT
+build.type=RELEASE
+#build.type=DEVELOPMENT
project.org.netbeans.progress=org-netbeans-api-progress
project.org.sleuthkit.autopsy.experimental=Experimental
diff --git a/unix_setup.sh b/unix_setup.sh
new file mode 100755
index 0000000000..93a98ae1bc
--- /dev/null
+++ b/unix_setup.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Verifies programs are installed and copies native code into the Autopsy folder structure
+
+TSK_VERSION=4.6.0
+
+# Verify PhotoRec was installed
+photorec_filepath=/usr/bin/photorec
+if [ -f "$photorec_filepath" ]; then
+ echo "$photorec_filepath found"
+else
+ echo "ERROR: Photorec not found, please install the testdisk package"
+ exit 1
+fi
+
+# Verify Java was installed and configured
+if [ -n "$JAVA_HOME" ]; then
+ if [ -x "$JAVA_HOME/bin/java" ]; then
+ echo "Java found in $JAVA_HOME"
+ else
+ echo "ERROR: Java was not found in $JAVA_HOME"
+ exit 1
+ fi
+else
+ echo "ERROR: JAVA_HOME environment variable must be defined"
+ exit 1
+fi
+
+# Verify Sleuth Kit Java was installed
+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 into the Autopsy directory"
+ rm $ext_jar_filepath;
+ if [ "$?" -gt 0 ]; then #checking if remove operation failed
+ echo "exiting .."
+ exit 1
+ else
+ cp $sleuthkit_jar_filepath $ext_jar_filepath
+ if [ "$?" -ne 0 ]; then # checking copy operation was successful
+ echo "exiting..."
+ exit 1
+ fi
+ fi
+else
+ echo "ERROR: $sleuthkit_jar_filepath not found, please install the sleuthkit-java.deb file"
+ exit 1
+fi
+
+# make sure it is executable
+chmod +x bin/autopsy
+
+echo "Autopsy is now configured. You can execute bin/autopsy to start it"