f630bef3b5
Finally simplify the time calculations!
...
According to
http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap01.html
a shell must be able to do modulus (=remainder). Zsh, bash and dash
confirm this and thus I can save another line and get rid of a very
ugly one.
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 16:15:00 +01:00
545158b56f
cleanup for messages and remove unecessary message
...
message=Beginning to backup, this may take some time...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 16:14:29 +01:00
f98853379e
also move the interval check further to the beginning
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 15:28:33 +01:00
ccf86defaf
move pre_exec part to the top
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 15:26:57 +01:00
49cb1f92ee
join line
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 15:17:01 +01:00
c2226f9134
BUGFIX: Use different destination directory based on the source number
...
If you have muliple sources, that go into the same destination
directory or specify a source mulitple times on the command line
and the backup is done within a minute, the destination directory
will still be the name:
497 export destination_name="${INTERVAL}.$(${CDATE}).$$"
None of the values will change for the next backup. Thus the new
format since ccollect 0.8.1 is
497 export destination_name="${INTERVAL}.$(${CDATE}).$$-${source_no}"
which contains the number of the current source.
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 15:07:50 +01:00
0f7891de8d
rename $i to $current_source
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 15:03:37 +01:00
a48fe6d41b
+braces
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 14:37:32 +01:00
ec61905fc4
always call $@, which is now setup correctly
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 14:02:50 +01:00
7e155f4219
prepare the next release
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 14:00:54 +01:00
6a8ff3f1d2
better quote TMP
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-11-01 13:37:02 +01:00
c314f284a2
export destination_* for usage in post_exec in documentate it
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-31 10:18:23 +01:00
e6d89d57fc
Fix Patricks patch: remove comments, remove if..then, add quotes for $@, do not add destination_full for post_exec
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-31 10:01:11 +01:00
e4dea56e49
Begin to replace false verbose handling
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-31 09:52:33 +01:00
59c8941373
cleanup destination setting :-)
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-31 09:15:53 +01:00
9e801582d5
use -d to prevent displaying the content of a directory
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-31 09:03:58 +01:00
435f2140da
cleanly set suffix
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-31 08:14:59 +01:00
145c6de2fb
double check quotes, remove grep
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-31 07:40:55 +01:00
1b591a040c
-p is not needed, when matching directories with */
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-31 07:31:23 +01:00
2a6ab4c125
adjust ls for existing backups to new delete_from_file behaviour
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-30 19:49:17 +01:00
39e8eb4c94
fix incomplete output message
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-30 19:45:03 +01:00
9d65e1b1bf
remove now obsolete code :-)
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-30 19:43:21 +01:00
ef4291c722
use delete_from_file with suffix
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-30 19:42:32 +01:00
086af1497c
need to unset $@ completly in delete_from_file()
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-30 19:42:13 +01:00
8a70e30d97
cleanup delete_from_file(): clean suffix stuff
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-30 19:26:32 +01:00
4865f3c8c6
extend delete_from_file() to allow removal of suffix files
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-30 19:25:23 +01:00
84c732bfc0
now put the dot back into CMARKER
...
Removed it some hundred commits before
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 20:15:14 +01:00
ce6157efee
begin to cleanup ugly awk line
...
Using ENVIRON[] instead of ugly quoting
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 20:13:50 +01:00
08331387b7
+braces
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 20:05:50 +01:00
262ceabca3
shorten some lines
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 19:53:26 +01:00
3d571e915a
add braces
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 19:50:04 +01:00
d7c4834dce
move c_marker to the global section, it's not specfic to a source
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 19:34:13 +01:00
229e251482
report about whole path, not the backup name
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 15:40:57 +01:00
422b220494
more smaller cleanups
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 15:40:37 +01:00
36f413173a
minor argument reordering - beautify
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 15:30:55 +01:00
23b2fcee08
move -* check at the right location
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 15:26:17 +01:00
25d8a2e2fb
remove double --help section
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-10-25 15:24:18 +01:00
f549334226
Add rsync arguments for source checking
...
Fix proposed by Nikita Koshikov:
--------------------------------------------------------------------------------
[...]
[guard] + set -- --archive --delete --numeric-ids --relative --delete-excluded --sparse --stats -v
[guard] + '[' -f /etc/ccollect/sources/guard/rsync_options ']'
[guard] + read line
[guard] + set -- --archive --delete --numeric-ids --relative --delete-excluded --sparse --stats -v
--password-file=/etc/ccollect/passwd
[guard] + read line
[guard] + rsync backup@192.168.1.8::etc
Password:
In this place it's sit and waiting for password. If I comment out related ccollect code section everything
start working as expected. I had to modify this part to be look like:
if ! rsync "${source}" "$@" >/dev/null 2>"${TMP}" ; then
if [ ! -f "${c_quiet_if_down}" ]; then
cat "${TMP}"
fi
_exit_err "Source ${source} is not readable. Skipping."
fi
Then checking host activity is passed and backup process running successful.
--------------------------------------------------------------------------------
Changed it to "$@" "$source" instead, to be consistent and use options
before source.
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-08-21 13:03:38 +02:00
26f4ae777b
prepare release 0.8
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-08-20 17:36:09 +02:00
8cc833a7b1
only change mtime of main dir, if sorting by mtime is selected
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-08-20 16:25:25 +02:00
02670a813c
synchronise order of options in ccollect with documentation
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-07-29 09:10:30 +02:00
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
4ba0dab260
Create function 'delete_from_file()'
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-07-28 12:43:23 +02:00
e6a0300b9b
Simplify removal code
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-07-28 07:47:48 +02:00
9aa111d21b
export TMP to subscripts
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-07-28 07:46:43 +02:00
428670b4e7
comment cleanups
...
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
2009-07-27 09:52:18 +02:00
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
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
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
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
Patrick Drolet