From baf04f327b7d75e225fd8197875ac589e4d33206 Mon Sep 17 00:00:00 2001
From: Brian Carrier <bcarrier@users.noreply.github.com>
Date: Mon, 12 Mar 2018 16:58:38 -0400
Subject: [PATCH] Updated comments.

---
 unix_setup.sh | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/unix_setup.sh b/unix_setup.sh
index 37ae23221a..efc2f46b8d 100755
--- a/unix_setup.sh
+++ b/unix_setup.sh
@@ -1,49 +1,52 @@
 #!/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 "Photorec not found, please install testdisk for the photorec carver functionality"
-	echo "run the command: sudo apt-get install testdisk"
+	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 "found java executable in $JAVA_HOME"
+		echo "Java found in $JAVA_HOME"
 	else
-		echo "no executable found in $JAVA_HOME"
+		echo "ERROR: Java was not found in $JAVA_HOME"
 		exit 1
 	fi
 else
-    	echo "Set JAVA_HOME env variable"
+    	echo "ERROR: JAVA_HOME environment variable must be defined"
     	exit 1	
 fi
 
-TSK_VERSION=4.6.0
+# 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 $sleuthkit_jar_filepath to the autopsy directory"
-    	echo "deleting $ext_jar_filepath"
+	echo "Copying into the Autopsy directory"
     	rm $ext_jar_filepath;
     	if [ "$?" -gt 0 ]; then  #checking if remove operation failed
         	echo "exiting .."
         	exit 1
     	else
-        	echo "Successfully removed $ext_jar_filepath"
         	cp $sleuthkit_jar_filepath $ext_jar_filepath
         	if [ "$?" -eq 0 ]; then # checking copy operation was successful
-            		echo "Successfully copied $sleuthkit_jar_filepath"
+            		# echo "Successfully copied $sleuthkit_jar_filepath"
         	else
         		echo "exiting..."
         		exit 1
         	fi
     	fi
 else
-	echo "$sleuthkit_jar_filepath not found, please install the sleuthkit-java.deb file"
+	echo "ERROR: $sleuthkit_jar_filepath not found, please install the sleuthkit-java.deb file"
 	exit 1
 fi