From 297e9b0463e9c175fb9622d1e1a1d046244add8f Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sun, 5 Mar 2017 14:02:02 -0600
Subject: [PATCH] remove set -e, deploy on master branch only

---
 .travis.yml                     | 5 ++---
 utils/packpack/startpackpack.sh | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a06ceabfe..88dd52588 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,6 @@ deploy:
   provider: script
   skip_cleanup: true
   script: utils/packpack/rsync_xfer.sh
-# Re-enable after testing is complete
-#  on:
-#    branch: master
+  on:
+    branch: master
 
diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index f81d95f12..968ca98ed 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -2,9 +2,6 @@
 # packpack setup file for the ZoneMinder project
 # Written by Andrew Bauer
 
-# Required, so that Travis marks the build as failed if any of the steps below fail
-set -ev
-
 ###############
 # SUBROUTINES #
 ###############
@@ -176,3 +173,6 @@ elif [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ]; then
         installtrusty
     fi
 fi
+
+exit 0
+