ungleich-public/ccollect
6
0
Fork 1
Code Issues Pull requests 1 Projects Releases Wiki Activity
562 commits 4 branches 35 tags 656 KiB
Commit graph

562 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nico Schottelius
aeb3ff6d89 john also introduced default option support 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 08:42:25 +02:00
Nico Schottelius
852155a4db Update changes list: +6 changes 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 08:33:59 +02:00
Nico Schottelius
4696590a73 Create SDATE, similar to DDATE and CDATE 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 17:16:13 +02:00
Nico Schottelius
ba11374c6f DOC: cosmetic changes 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 17:09:56 +02:00
Nico Schottelius
4b560f64f4 Test: include removal of incomplete backups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 17:09:34 +02:00
Nico Schottelius
50dcd80b85 add source, which deletes incomplete backups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 17:05:04 +02:00
Nico Schottelius
4ba0dab260 Create function 'delete_from_file()' 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 12:43:23 +02:00
Nico Schottelius
e6a0300b9b Simplify removal code 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 07:47:48 +02:00
Nico Schottelius
9aa111d21b export TMP to subscripts 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 07:46:43 +02:00
Nico Schottelius
8a56d41ebc very-verbose -> very_verbose 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 07:46:05 +02:00
Nico Schottelius
87e15be561 update example sources 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 07:45:13 +02:00
Nico Schottelius
77ea2b513f update example sources 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 20:39:09 +02:00
Nico Schottelius
4e3c5922ee add smaller tests - easier to detect the problem 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 20:38:55 +02:00
Nico Schottelius
428670b4e7 comment cleanups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:52:18 +02:00
Nico Schottelius
c2bc225dc0 SORT: make it more explicit, which sorting options are used 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:39:33 +02:00
Nico Schottelius
483cfee90c Reorder: All checks being done in the same place 
All configurations are checked in the same place

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:37:50 +02:00
Nico Schottelius
cbf1b7cf0e Simplify error printing, if quiet_if_down is set 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:17:06 +02:00
Nico Schottelius
b014c00d24 Remove double code imported with merge 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:16:35 +02:00
Nico Schottelius
d61c9625f4 Only check configuration options, if the base is exitsing 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:06:01 +02:00
Nico Schottelius
65c34deb43 remove unecessary whitespace in line 204 :-) 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:01:13 +02:00
Nico Schottelius
2b890b0316 Merge commit 'john/updates' 
Fixed alot of conflicts due to parallel work, but it looks very good now!

Conflicts:
	ccollect.sh
 2009-07-24 09:09:16 +02:00
Nico Schottelius
1b1e0ebc8b update example sources 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-24 09:00:48 +02:00
Nico Schottelius
e136b132e6 update changes list 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-24 08:59:13 +02:00
Nico Schottelius
b44fdb6107 some cleanups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-24 08:58:48 +02:00
Nico Schottelius
e390c62072 run all sources as a test 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-24 08:57:53 +02:00
Nico Schottelius
ef641b5e31 update ccollect vs. rsnapshot LOC statistic 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 19:42:56 +02:00
Nico Schottelius
c9472c5dff add luckys patches 
idea looks good, patches need some claenups

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 18:55:25 +02:00
Nico Schottelius
ed30a4d25b Remove check for directories with -a 
Type of source is checked later anyway and using
ls -p1 results in "dir/", which we should cleanup
with "sed 's;/$;;' again, which is ugly.

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:56:41 +02:00
Nico Schottelius
8a87e7effa Move option check below the check for existence of source 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:53:35 +02:00
Nico Schottelius
f5e1920a15 join source handling for --all and normal 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:47:54 +02:00
Nico Schottelius
8491a54b0d extract the interval handling from parsing 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:46:04 +02:00
Nico Schottelius
debdd9d004 BUGFIX: Fix --all handling 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:39:42 +02:00
Nico Schottelius
37dcda8e3b BUGFIX: ignore -- as parameter 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:37:55 +02:00
Nico Schottelius
3ea39547a7 cleanup example conf/ directory 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:29:21 +02:00
Nico Schottelius
017b80f59b more todo (thanks goes to D-Tick) 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-19 19:29:06 +02:00
Nico Schottelius
19bc94a756 [DOC] correct destination examples 
Thanks, D-Tick.

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-08 16:08:08 +02:00
Nico Schottelius
8423fa136f remove hint on German documentation in README 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 22:42:08 +02:00
Nico Schottelius
5da5506c65 add quotes to every possible problematic variable, add braces 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 22:39:42 +02:00
Nico Schottelius
31ef31801e only consider directories as sources 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 18:03:51 +02:00
Nico Schottelius
09ed55a17e only consider directories as sources 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 17:09:30 +02:00
Nico Schottelius
a9aad1ed8f correct indent 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 17:08:59 +02:00
Nico Schottelius
65a7badd4d changes for the next version 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 12:43:22 +02:00
Nico Schottelius
bd1e365ca0 replace multiple echos with one cat 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 12:42:32 +02:00
Nico Schottelius
ca1231a576 begin to implement new style option parsing 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 12:03:40 +02:00
Nico Schottelius
de6a7893fc [DOC] Move German documentation to old/ (unmaintained) 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 10:03:00 +02:00
Nico Schottelius
194148b5b3 update url of homepage 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 10:00:18 +02:00
jll2
6fd22b6416 Move "interval definition section". 
The interval definition section was down to just before the
maximum backup check.  This makes the code more friendly to
automatic interval selection.  Auto interval selection needs to
have ddir defined first and it is best if it is done after
delete_incomplete.  This change accomplishes that while still
placing it before the maximum backup check which needs to know
the interval.
 2009-06-26 15:22:09 -07:00
jll2
72830a4647 If the user specifies "delete_incomplete", this patch makes it 
so all incomplete backups are deleted, not just the ones with
the particular interval that the user specified.

The advantage of this is that those to-be-deleted incomplete
backups will not interfere with calculations required for
automatic interval selection.
 2009-06-26 14:54:28 -07:00
jll2
76e6094247 Simplify interval code. 
Eight lines and two variables are removed which makes the code,
I think, easier to read.

The main motivation for this change, however, is that it makes
ccollect.sh more friendly to (future) auto interval selection.
The removed lines and variables assumed that the interval was
known prior to the start of the source loop.  With auto interval
selection, the selected interval can be different for each
source.
 2009-06-26 14:42:45 -07:00
jll2
0b064e0565 Beautify: remove trailing white space. 
If your editor does not highlight trailing white space,
you won't see a difference.
 2009-06-26 14:09:21 -07:00