From: Nicolas Boisselier Date: Thu, 8 Sep 2016 18:37:11 +0000 (+0200) Subject: bin/owncloud-sync X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=117a43c6d281252ed7422265f8994dd70301b75f;p=nb.git bin/owncloud-sync --- diff --git a/bin/owncloud-sync b/bin/owncloud-sync index 9341f4c3..540018d4 100755 --- a/bin/owncloud-sync +++ b/bin/owncloud-sync @@ -49,7 +49,7 @@ main() { if [ "$UID" == "0" ]; then owncloud_all "/{home,Users}/*/ownCloud" else - owncloud_sync "~/ownCloud" https://owncloud.nbdom.net + owncloud_sync ~/ownCloud https://owncloud.nbdom.net fi } ################################################################################ @@ -105,9 +105,9 @@ owncloud_sync() { return 1 fi - owncloudcmd -n --non-interactive "$1" "$2" 2>&1 | perl -ne 'print "$1 $2 $3\n" iand next; if /OCC::(\S+).*?"(.*?)" . "(.*?)" "(.*?)"/; print' + trap "rm $lock*" EXIT + owncloudcmd -n --non-interactive "$1" "$2" 2>&1 | perl -ne 'print "$1 $2 $3\n" and next if /OCC::(\S+).*?"(.*?)" "(.*?)"/; /err|failed/i and print' - rm "$lock" return 0 }