From c042479097d25a539aeaf20ffc25fe28ffe24c7e Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@denkbrett.intern.schottelius.org>
Date: Tue, 14 Aug 2007 15:26:20 +0200
Subject: [PATCH] Add much more timing information

And empty $@ and $#, which we'll reuse later.
---
 ccollect.sh                            | 97 ++++++++++++++------------
 conf/sources/source with spaces/source |  2 +-
 doc/CHANGES                            |  1 +
 doc/todo/0.6                           |  3 +
 4 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/ccollect.sh b/ccollect.sh
index c656f16..58cf25b 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -14,14 +14,14 @@ CPREEXEC="$CDEFAULTS/pre_exec"
 CPOSTEXEC="$CDEFAULTS/post_exec"
 
 TMP=$(mktemp /tmp/$(basename $0).XXXXXX)
-VERSION=0.5.3
+VERSION=0.6
 RELEASE="2007-XX-XX"
 HALF_VERSION="ccollect $VERSION"
 FULL_VERSION="ccollect $VERSION ($RELEASE)"
 
 #
 # CDATE: how we use it for naming of the archives
-# DDATE: how the user should see it in our output
+# DDATE: how the user should see it in our output (DISPLAY)
 #
 CDATE="date +%Y-%m-%d-%H%M"
 DDATE="date +%Y-%m-%d-%H:%M:%S"
@@ -40,9 +40,16 @@ trap "rm -f \"$TMP\"" 1 2 15
 # Functions
 #
 
+# time displaying echo
+_techo()
+{
+   echo "$(${DDATE}): $@"
+}
+
+# exit on error
 _exit_err()
 {
-   echo "$@"
+   _techo "$@"
    rm -f "$TMP"
    exit 1
 }
@@ -96,8 +103,9 @@ no_sources=0
 #
 # Create source "array"
 #
-while [ "$i" -le $# ]; do
-   eval arg=\"\$$i\"
+while [ "$#" -ge 1 ]; do
+   eval arg=\"\$1\"
+   shift
 
    if [ "$NO_MORE_ARGS" = 1 ]; then
         eval source_${no_sources}=\"$arg\"
@@ -135,6 +143,9 @@ done
 # also export number of sources
 export no_sources
 
+echo $@, $#
+exit
+
 #
 # be really, really, really verbose
 #
@@ -163,6 +174,15 @@ if [ "$ALL" = 1 ]; then
    done < "${TMP}"
 fi
 
+#
+# Need at least ONE source to backup
+#
+if [ "${no_sources}" -lt 1 ]; then
+   usage
+else
+   _techo "${HALF_VERSION}: Beginning backup using interval ${INTERVAL}"
+fi
+
 #
 # Look for pre-exec command (general)
 #
@@ -171,19 +191,10 @@ if [ -x "${CPREEXEC}" ]; then
    "${CPREEXEC}"; ret=$?
    echo "Finished ${CPREEXEC}."
 
-   [ "${ret}" -eq 0 ] || _exit_err "${CPREEXEC} exited with return-code $ret" \
+   [ "${ret}" -eq 0 ] || _exit_err "${CPREEXEC} exited with return code ${ret}" \
                                    ", aborting backup."
 fi
 
-#
-# Need at least ONE source to backup
-#
-if [ "$no_sources" -lt 1 ]; then
-   usage
-else
-   echo "==> $HALF_VERSION: Beginning backup using interval $INTERVAL <=="
-fi
-
 #
 # check default configuration
 #
@@ -191,6 +202,7 @@ fi
 D_FILE_INTERVAL="${CDEFAULTS}/intervals/${INTERVAL}"
 D_INTERVAL=$(cat "${D_FILE_INTERVAL}" 2>/dev/null)
 
+
 #
 # Let's do the backup
 #
@@ -223,7 +235,7 @@ while [ "$i" -lt "$no_sources" ]; do
    exec 2>&1
 
    #
-   # Standard locations
+   # Configuration
    #
    backup="${CSOURCES}/${name}"
    c_source="${backup}/source"
@@ -235,17 +247,12 @@ while [ "$i" -lt "$no_sources" ]; do
    c_summary="${backup}/summary"
    c_pre_exec="${backup}/pre_exec"
    c_post_exec="${backup}/post_exec"
-
-
-   #
-   # FIXME: enable in 0.6
-   # Always execute, warn if it exists in normal case
-   # and rm -rf the old backup, if "delete_incomplete" is set
-   #
    c_incomplete="$backup/delete_incomplete"
-   #c_marker=".ccollect-${CDATE}.$$"
 
-   begin=$($DDATE)
+   #
+   # Times
+   #
+   c_marker=".ccollect-$(${CDATE}).$$"
    begin_s=$(date +%s)
 
    #
@@ -257,13 +264,13 @@ while [ "$i" -lt "$no_sources" ]; do
    VERBOSE=""
    VVERBOSE=""
 
-   echo "${begin} Beginning to backup"
+   _techo "Beginning to backup"
 
    #
    # Standard configuration checks
    #
    if [ ! -e "${backup}" ]; then
-      echo "Source does not exist."
+      _techo "Source does not exist."
       exit 1
    fi
 
@@ -271,7 +278,7 @@ while [ "$i" -lt "$no_sources" ]; do
    # configuration _must_ be a directory
    #
    if [ ! -d "${backup}" ]; then
-      echo "\"${name}\" is not a cconfig-directory. Skipping."
+      _techo "\"${name}\" is not a cconfig-directory. Skipping."
       exit 1
    fi
 
@@ -280,14 +287,12 @@ while [ "$i" -lt "$no_sources" ]; do
    # parameters
    #
    if [ -x "${c_pre_exec}" ]; then
-      echo "Executing ${c_pre_exec} ..."
+      _techo "Executing ${c_pre_exec} ..."
       "${c_pre_exec}"; ret="$?"
-      echo "Finished ${c_pre_exec}."
+      _techo "Finished ${c_pre_exec} (return code ${ret})."
 
-      # FIXME: is _exit_err senseful here?
       if [ "${ret}" -ne 0 ]; then
-         echo "${c_pre_exec} failed. Skipping."
-         exit 1
+         _exit_err "${c_pre_exec} failed. Skipping."
       fi
    fi
 
@@ -299,25 +304,20 @@ while [ "$i" -lt "$no_sources" ]; do
    if [ -z "${c_interval}" ]; then
       c_interval="${D_INTERVAL}"
 
-      # FIXME: is _exit_err senseful here?
       if [ -z "${c_interval}" ]; then
-         echo "No definition for interval \"${INTERVAL}\" found. Skipping."
-         exit 1
+         _exit_err "No definition for interval \"${INTERVAL}\" found. Skipping."
       fi
    fi
 
    #
    # Source checks
    #
-   # FIXME: is _exit_err senseful here?
    if [ ! -f "${c_source}" ]; then
-      echo "Source description ${c_source} is not a file. Skipping."
-      exit 1
+      _exit_err "Source description \"${c_source}\" is not a file. Skipping."
    else
-      source=$(cat "$c_source")
-      if [ $? -ne 0 ]; then
-         echo "Source $c_source is not readable. Skipping."
-         exit 1
+      source=$(cat "${c_source}"); ret=$?
+      if [ ${ret} -ne 0 ]; then
+         _exit_err "Source ${c_source} is not readable. Skipping."
       fi
    fi
 
@@ -325,14 +325,19 @@ while [ "$i" -lt "$no_sources" ]; do
    # destination _must_ be a directory
    #
    if [ ! -d "${c_dest}" ]; then
-      echo "Destination ${c_dest} neither links to nor is a directory. Skipping."
-      exit 1
+      _exit_err "Destination ${c_dest} neither links to nor is a directory. Skipping."
    fi
 
+   # NEW
+   # - insert ccollect default parameters
+   # - insert options
+   # - insert user options
+
+
    #
    # exclude list
    #
-   if [ -f "$c_exclude" ]; then
+   if [ -f "${c_exclude}" ]; then
       # FIXME: check how quoting at the end looks like
       # perhaps our source contains spaces!
       EXCLUDE="--exclude-from=$c_exclude"
diff --git a/conf/sources/source with spaces/source b/conf/sources/source with spaces/source
index 46b885f..13f435d 100644
--- a/conf/sources/source with spaces/source	
+++ b/conf/sources/source with spaces/source	
@@ -1 +1 @@
-/home/user/nico/test2
+/home/user/nico/projekte/ccollect
diff --git a/doc/CHANGES b/doc/CHANGES
index 505ee9a..abc7478 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -2,6 +2,7 @@
    * add 'exec-after-rm' (source specific) configuration
    * added logwrapper
    * Always print return code of rsync
+   * Add much more timing information
 
 0.5.1 to 0.5.2:
    * Display correct error code, if rsync returns non-zero
diff --git a/doc/todo/0.6 b/doc/todo/0.6
index 85fd981..a1fb24e 100644
--- a/doc/todo/0.6
+++ b/doc/todo/0.6
@@ -32,6 +32,8 @@ _eecho () { _techo "ERROR $msg" }
    Wenn Summary angegeben ist am Ende ausgeben
 - add --version, -V
 - do we want rsync -H by default?
+- add source/ignore_failed_pre_exec
+- add source/ignore_failed_post_exec
 
 ssh / port change:
    change rsync_extra format
@@ -48,4 +50,5 @@ Documentation:
 - Variables:
    source_$n
    no_sources
+   name