Merge branch 'master' into u/rtgoodwin/headless-patch

This commit is contained in:
cimryan
2018-10-29 07:10:06 -07:00
3 changed files with 4 additions and 4 deletions

View File

@@ -159,7 +159,7 @@ function wait_for_archive_to_be_unreachable () {
log "Waiting for archive to be unreachable..."
while [ true ]
do
if ! archive_is_reachable
if ! retry archive_is_reachable
then
log "Archive is unreachable."
break

View File

@@ -4,7 +4,7 @@ log "Archiving through rsync..."
source /root/.teslaCamRsyncConfig
num_files_moved=$(rsync -auvh --stats --log-file=/tmp/archive-rsync-cmd.log /mnt/cam/TeslaCam/saved* $user@$server:$path | awk '/files transferred/{print $NF}')
num_files_moved=$(rsync -auzvh --no-perms --stats --log-file=/tmp/archive-rsync-cmd.log /mnt/cam/TeslaCam/saved* $user@$server:$path | awk '/files transferred/{print $NF}')
/root/bin/send-pushover "$num_files_moved"