Index: /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh	(revision 25899)
+++ /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh	(revision 25900)
@@ -69,4 +69,9 @@
 if [ ${build} -eq 1 ]; then
 	./jenkins/jenkins.sh ./jenkins/ross-debian_linux-binaries-matlab
+
+	if [ $? -ne 0 ]; then
+		echo 'Build failed'
+		exit 1
+	fi
 fi
 
Index: /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python.sh
===================================================================
--- /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python.sh	(revision 25899)
+++ /issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python.sh	(revision 25900)
@@ -69,4 +69,9 @@
 if [ ${build} -eq 1 ]; then
 	./jenkins/jenkins.sh ./jenkins/ross-debian_linux-binaries-python
+
+	if [ $? -ne 0 ]; then
+		echo 'Build failed'
+		exit 1
+	fi
 fi
 
Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh	(revision 25899)
+++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh	(revision 25900)
@@ -45,10 +45,10 @@
 
 skip_tests=0
-while [ $# -gt 0 ]; do
-    case $1 in
-        -s|--skiptests) skip_tests=1;					;;
-        *) echo "Unknown parameter passed: $1"; exit 1	;;
-    esac
-    shift
+
+if [ $# -eq 1 ]; then
+	case $1 in
+		-s|--skiptests) skip_tests=1;					;;
+		*) echo "Unknown parameter passed: $1"; exit 1	;;
+	esac
 done
 
@@ -65,5 +65,5 @@
 mkdir ${PKG}
 
-# Add/modify required binaries and libraries
+# Add required binaries and libraries to package and modify them where needed
 cd ${ISSM_DIR}/bin
 
@@ -153,5 +153,5 @@
 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 test ${PKG}
 mkdir ${PKG}/execution
 echo "Cleaning up unneeded/unwanted files"
Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python.sh
===================================================================
--- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python.sh	(revision 25899)
+++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python.sh	(revision 25900)
@@ -44,10 +44,10 @@
 
 skip_tests=0
-while [ $# -gt 0 ]; do
-    case $1 in
-        -s|--skiptests) skip_tests=1;					;;
-        *) echo "Unknown parameter passed: $1"; exit 1	;;
-    esac
-    shift
+
+if [ $# -eq 1 ]; then
+	case $1 in
+		-s|--skiptests) skip_tests=1;					;;
+		*) echo "Unknown parameter passed: $1"; exit 1	;;
+	esac
 done
 
@@ -58,5 +58,5 @@
 mkdir ${PKG}
 
-# Add/modify required binaries and libraries
+# Add required binaries and libraries to package and modify them where needed
 cd ${ISSM_DIR}/bin
 
@@ -152,5 +152,5 @@
 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 test ${PKG}
 mkdir ${PKG}/execution
 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
Index: /issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-matlab.sh	(revision 25899)
+++ /issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-matlab.sh	(revision 25900)
@@ -98,4 +98,9 @@
 if [ ${build} -eq 1 ]; then
 	./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-matlab
+
+	if [ $? -ne 0 ]; then
+		echo 'Build failed'
+		exit 1
+	fi
 fi
 
Index: /issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python.sh	(revision 25899)
+++ /issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python.sh	(revision 25900)
@@ -98,4 +98,9 @@
 if [ ${build} -eq 1 ]; then
 	./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-python
+
+	if [ $? -ne 0 ]; then
+		echo 'Build failed'
+		exit 1
+	fi
 fi
 
Index: /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh	(revision 25899)
+++ /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh	(revision 25900)
@@ -167,5 +167,5 @@
 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 test ${PKG}
 mkdir ${PKG}/execution
 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
Index: /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh	(revision 25899)
+++ /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh	(revision 25900)
@@ -105,4 +105,10 @@
 fi
 
+# Clean up from previous packaging
+echo "Cleaning up existing assets"
+cd ${ISSM_DIR}
+rm -rf ${PKG} ${COMPRESSED_PKG}
+mkdir ${PKG}
+
 # Add required binaries and libraries to package and modify them where needed
 cd ${ISSM_DIR}/bin
@@ -195,7 +201,6 @@
 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 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
 echo "Cleaning up unneeded/unwanted files"