From cd21d9c072c67a90beb374c8c131fdf35f0924b9 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@hydrogenium.schottelius.org>
Date: Fri, 19 Jan 2007 20:07:34 +0100
Subject: [PATCH] Merge todos

Cleanup 0.5.2 for release
---
 TODO           | 24 ------------------------
 ccollect.sh    |  6 +++---
 doc/todo/0.5.3 |  2 ++
 doc/todo/0.6   | 17 +++++++++++++++++
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/TODO b/TODO
index b016b90..486e76d 100644
--- a/TODO
+++ b/TODO
@@ -1,28 +1,4 @@
 --------------------------------------------------------------------------------
-1. export more variables for scripts
-   or check when they are automatically exported
---------------------------------------------------------------------------------
-1.1.
-Anhaengen von der -F / --filter Doku von Killerfox
---------------------------------------------------------------------------------
-1.2. replace sed?
-compare timing:
-   _echo () { echo "$name $msg" }
-and create
-   _techo () { echo "$timestamp $name $msg" }
-perhaps create
-   _eecho () { _techo "ERROR $msg" }
-?
---------------------------------------------------------------------------------
-2. clonen von anderen existierenden backups?
---------------------------------------------------------------------------------
-3. detect unfinished backups
-sven / markierung
-   - wie seht der Marker aus?
-      -> .ccollect-YEAR-MM-DD.HHmm.pid (like the directory)
-   --> assume incomplete, when we did not finish.
-   --> means it's complete,when rsync was successful
---------------------------------------------------------------------------------
 4. Add ccollect-restore.sh
    (new project, perhaps coordinated with jchome's ccollect-config)
 
diff --git a/ccollect.sh b/ccollect.sh
index e6ff131..7d85b6d 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -428,7 +428,7 @@ while [ "$i" -lt "$no_sources" ]; do
    destination_dir="$c_dest/${INTERVAL}.${destination_date}.$$"
 
    #
-   # FIXME: 
+   # FIXME: In 0.6 add search for the latest available backup!
    #
    last_dir=$(ls -d "$c_dest/${INTERVAL}."?* 2>/dev/null | sort -n | tail -n 1)
 
@@ -444,9 +444,9 @@ while [ "$i" -lt "$no_sources" ]; do
    abs_destination_dir="$(cd "$destination_dir" && pwd -P)"
 
    #
-   # add mark
+   # FIXME: add mark in 0.6 (and remove if successful later!
    #
-   touch "${abs_destination_dir}/${c_marker}"
+   #touch "${abs_destination_dir}/${c_marker}"
 
    #
    # the rsync part
diff --git a/doc/todo/0.5.3 b/doc/todo/0.5.3
index 2ecfdc6..b193f15 100644
--- a/doc/todo/0.5.3
+++ b/doc/todo/0.5.3
@@ -1,3 +1,5 @@
+- check and export variables for use in scripts!
+- documentation: -F / --filter for rsync
 - join todos
 - fix possible quoting problems
    * rsync_extra (redefine format)
diff --git a/doc/todo/0.6 b/doc/todo/0.6
index 4bcdb1b..0ce1bc2 100644
--- a/doc/todo/0.6
+++ b/doc/todo/0.6
@@ -4,6 +4,23 @@
      ours
    * or add 'prefer_same_interval' instead?
 - implement detection of partial backups
+3. detect unfinished backups
+sven / markierung
+   - wie seht der Marker aus?
+      -> .ccollect-YEAR-MM-DD.HHmm.pid (like the directory)
+   --> assume incomplete, when we did not finish.
+   --> means it's complete,when rsync was successful
+---> partial implemented in 0.5.2 (commented out)
 - do not check by name, but by time
    * is ls -t posix?
    * also check: -p -1
+- do sed-time check:
+1.2. replace sed?
+compare timing:
+_echo () { echo "$name $msg" }
+and create
+_techo () { echo "$timestamp $name $msg" }
+perhaps create
+_eecho () { _techo "ERROR $msg" }
+?
+