Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh
===================================================================
--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh	(revision 27147)
+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh	(revision 27148)
@@ -144,7 +144,7 @@
 	${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib ${ISSM_DIR}/share; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
 
 	# Check that MATLAB did not exit in error
-	matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log | wc -l`
+	matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log`
 
 	if [ ${matlabExitedInError} -ne 0 ]; then
 		echo "----------MATLAB exited in error!----------"
@@ -158,10 +158,12 @@
 	fi
 
 	# Check that all tests passed
-	numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
+	sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
+	numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
 
 	if [ ${numTestsFailed} -ne 0 ]; then
 		echo "One or more tests FAILED"
+		cat matlab.log
 		exit 1
 	else
 		echo "All tests PASSED"
@@ -174,7 +176,7 @@
 cd ${ISSM_DIR}
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}
+cp -rf bin examples lib scripts share test ${PKG}
 mkdir ${PKG}/execution
 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
 echo "Cleaning up unneeded/unwanted files"
Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh
===================================================================
--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh	(revision 27147)
+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh	(revision 27148)
@@ -142,7 +142,7 @@
 
 	# Check that Python did not exit in error
 	pythonExitCode=`echo $?`
-	pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
+	pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
 
 	if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
 		echo "----------Python exited in error!----------"
@@ -156,10 +156,12 @@
 	fi
 
 	# Check that all tests passed
-	numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
+	sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
+	numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
 
 	if [ ${numTestsFailed} -ne 0 ]; then
 		echo "One or more tests FAILED"
+		cat python.log
 		exit 1
 	else
 		echo "All tests PASSED"
@@ -172,7 +174,7 @@
 cd ${ISSM_DIR}
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}
+cp -rf bin examples lib scripts share test ${PKG}
 mkdir ${PKG}/execution
 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh
===================================================================
--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh	(revision 27147)
+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh	(revision 27148)
@@ -145,7 +145,7 @@
 
 	# Check that Python did not exit in error
 	pythonExitCode=`echo $?`
-	pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
+	pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
 
 	if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
 		echo "----------Python exited in error!----------"
@@ -159,10 +159,12 @@
 	fi
 
 	# Check that all tests passed
-	numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
+	sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
+	numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
 
 	if [ ${numTestsFailed} -ne 0 ]; then
 		echo "One or more tests FAILED"
+		cat python.log
 		exit 1
 	else
 		echo "All tests PASSED"
@@ -175,7 +177,7 @@
 cd ${ISSM_DIR}
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}
+cp -rf bin examples lib scripts share test ${PKG}
 mkdir ${PKG}/execution
 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
Index: ../trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh
===================================================================
--- ../trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh	(revision 27147)
+++ ../trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh	(revision 27148)
@@ -33,7 +33,7 @@
 
 # Check that MATLAB did not exit in error
 matlabExitCode=`echo $?`
-matlabExitedInError=`grep -E "Activation cannot proceed|license|Error|Warning: Name is nonexistent or not a directory" matlab.log | wc -l`
+matlabExitedInError=`grep -c -E "Activation cannot proceed|license|Error|Warning: Name is nonexistent or not a directory" matlab.log`
 
 if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
 	echo "----------MATLAB exited in error!----------"
@@ -44,7 +44,7 @@
 fi
 
 # Check that all tests passed
-numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
+numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
 
 if [[ ${numTestsFailed} -ne 0 ]]; then
 	echo "One or more tests FAILED"
Index: ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh
===================================================================
--- ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh	(revision 27147)
+++ ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh	(revision 27148)
@@ -33,7 +33,7 @@
 
 # Check that Python did not exit in error
 pythonExitCode=`echo $?`
-pythonExitedInError=`grep -E "runme.py: error" python.log | wc -l`
+pythonExitedInError=`grep -c -E "runme.py: error" python.log`
 
 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
 	echo "----------Python exited in error!----------"
@@ -43,7 +43,7 @@
 fi
 
 # Check that all tests passed
-numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
+numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
 
 if [[ ${numTestsFailed} -ne 0 ]]; then
 	echo "One or more tests FAILED"
Index: ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh
===================================================================
--- ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh	(revision 27147)
+++ ../trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh	(revision 27148)
@@ -33,7 +33,7 @@
 
 # Check that Python did not exit in error
 pythonExitCode=`echo $?`
-pythonExitedInError=`grep -E "runme.py: error" python.log | wc -l`
+pythonExitedInError=`grep -c -E "runme.py: error" python.log`
 
 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
 	echo "----------Python exited in error!----------"
@@ -43,7 +43,7 @@
 fi
 
 # Check that all tests passed
-numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
+numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
 
 if [[ ${numTestsFailed} -ne 0 ]]; then
 	echo "One or more tests FAILED"
Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh
===================================================================
--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh	(revision 27147)
+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh	(revision 27148)
@@ -130,7 +130,7 @@
 	${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib ${ISSM_DIR}/share; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
 
 	# Check that MATLAB did not exit in error
-	matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log | wc -l`
+	matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log`
 
 	if [ ${matlabExitedInError} -ne 0 ]; then
 		echo "----------MATLAB exited in error!----------"
@@ -144,7 +144,8 @@
 	fi
 
 	# Check that all tests passed
-	numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
+	sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
+	numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
 
 	if [ ${numTestsFailed} -ne 0 ]; then
 		echo "One or more tests FAILED"
@@ -161,7 +162,7 @@
 cd ${ISSM_DIR}
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}
+cp -rf bin examples lib scripts share test ${PKG}
 mkdir ${PKG}/execution
 echo "Cleaning up unneeded/unwanted files"
 rm -f ${PKG}/bin/generic_static.* # Remove static versions of generic cluster classes
Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh
===================================================================
--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh	(revision 27147)
+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh	(revision 27148)
@@ -129,7 +129,7 @@
 
 	# Check that Python did not exit in error
 	pythonExitCode=`echo $?`
-	pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
+	pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
 
 	if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
 		echo "----------Python exited in error!----------"
@@ -143,11 +143,12 @@
 	fi
 
 	# Check that all tests passed
-	numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
+	sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
+	numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
 
 	if [[ ${numTestsFailed} -ne 0 ]]; then
-			echo "One or more tests FAILED"
-			cat python.log
+		echo "One or more tests FAILED"
+		cat python.log
 		exit 1
 	else
 		echo "All tests PASSED"
@@ -160,7 +161,7 @@
 cd ${ISSM_DIR}
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}
+cp -rf bin examples lib scripts share test ${PKG}
 mkdir ${PKG}/execution
 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
 echo "Cleaning up unneeded/unwanted files"
Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh
===================================================================
--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh	(revision 27147)
+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh	(revision 27148)
@@ -132,7 +132,7 @@
 
 	# Check that Python did not exit in error
 	pythonExitCode=`echo $?`
-	pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
+	pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
 
 	if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
 		echo "----------Python exited in error!----------"
@@ -146,7 +146,8 @@
 	fi
 
 	# Check that all tests passed
-	numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
+	sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
+	numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
 
 	if [[ ${numTestsFailed} -ne 0 ]]; then
 		echo "One or more tests FAILED"
@@ -163,7 +164,7 @@
 cd ${ISSM_DIR}
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}
+cp -rf bin examples lib scripts share test ${PKG}
 mkdir ${PKG}/execution
 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
 echo "Cleaning up unneeded/unwanted files"