From 6b43deb1e57851dfcf152496f1df9734b0f03473 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 19 Apr 2017 07:11:20 -0500 Subject: [PATCH] Update rsync_xfer.sh remove set -ev, add a message when the remote filesystem mounted successfully --- utils/packpack/rsync_xfer.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/utils/packpack/rsync_xfer.sh b/utils/packpack/rsync_xfer.sh index ab0eb9692..bb2e770cf 100755 --- a/utils/packpack/rsync_xfer.sh +++ b/utils/packpack/rsync_xfer.sh @@ -1,8 +1,5 @@ #!/bin/bash -# Required, so that Travis marks the build as failed if any of the steps below fail -set -ev - # Check to see if this script has access to all the commands it needs for CMD in sshfs rsync find fusermount mkdir; do type $CMD 2>&1 > /dev/null @@ -23,6 +20,11 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then ssh_mntchk="$(sshfs zmrepo@zmrepo.zoneminder.com:./ ./zmrepo -o workaround=rename,reconnect)" if [ -z "$ssh_mntchk" ]; then + echo + echo "Remote filesystem mounted successfully." + echo "Being transfering files..." + echo + # Don't keep packages older than 5 days find ./zmrepo -maxdepth 1 -type f -mtime +5 -delete rsync --ignore-errors --verbose ./build/ ./zmrepo/ @@ -33,5 +35,6 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then echo "sshfs gave the following error message:" echo \"$ssh_mntchk\" echo + exit 99 fi fi