bin/owncloud-sync

diff --git a/bin/owncloud-sync b/bin/owncloud-sync
index a56dbc7b53bdbea3ed9dda8c456dac14922a1e1a..211c37636ca932e842a570a5cd19ac0ea3468e52 100755 (executable)
--- a/bin/owncloud-sync
+++ b/bin/owncloud-sync
@@ -109,7 +109,7 @@ owncloud_sync() {
   #owncloudcmd -n --non-interactive "$1" "$2" 2>&1 | perl -ne 'print  if s/^!!!\s*OCC:://'
   #owncloudcmd -n --non-interactive "$1" "$2" 2>&1 | perl -ne 'print join(" ",@_)."\n" and next if @_=/OCC::(\S+).*?"(.*?)" "(.*?)"/;'
   owncloudcmd -n --non-interactive "$1" "$2" 2>&1 | \
-    perl -ne 'printf("%s %-10s %s\n",$2,$1,$3) if /OCC::(.*?) created for "(.*?)" . "(.*?)" "(.*?)"/'
+    perl -ne 'BEGIN{$v=shift @ARGV };printf("%s %-10s %s\n",$2,$1,$3) if $v and /OCC::(.*?) created for "(.*?)" . "(.*?)" "(.*?)"/' "$VERBOSE"
 
   return 0
 }
@@ -121,13 +121,16 @@ owncloud_all() {
     user=`ls -ld "$dir" |awk '{print $3}'`
     cd "$dir" || continue
 
-    [ "$VERBOSE" -gt 0 ] && echo "$user: $dir"
+    #[ "$VERBOSE" -gt 0 ] && echo "$user: $dir"
 
     args=""
+    [ "$VERBOSE" -gt 0 ] && args="$args --verbose"
     if [ "$DEBUG" -gt 0 ]; then
       echo su - "$user" -c "${NAME}${args}"
+      continue
     fi
-    su - "$user" -c "${NAME}${args}" | sed "s/^/$user /"
+
+    su - "$user" -c "${NAME}${args}" | sed "s~^~$user:$dir ~"
 
   done
 }