diff --git a/Makefile b/Makefile index 89564e5..d6fac7d 100644 --- a/Makefile +++ b/Makefile @@ -19,13 +19,20 @@ host=creme.schottelius.org dir=www/org/schottelius/linux/ccollect docdir=$(dir)/doc +# +# End user targets +# all: @echo "Nothing to make, make install." -install: - $(INSTALL) -D -m 0755 -s $(CCOLLECT) $(destination) +install: install-script install-link + +install-link: install-script $(LN) $(destination) $(path_destination) +install-script: + $(INSTALL) -D -m 0755 -s $(CCOLLECT) $(destination) + documentation: @echo "Generating HTML-documentation" @asciidoc -n -o doc/ccollect.html doc/ccollect.text diff --git a/doc/TODO b/doc/TODO index a1de608..949d760 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,6 +1,11 @@ +- write mkccollectconfig + o create source configuration + o another script for changing defaults + x intervalls + x pre-/post exec + o dialog based? + - implement pre- and post-exec commands - o For the general backup process - o source specific o what to do with return values? - Documentation @@ -21,3 +26,6 @@ DONE - write a simple manual - Hints section - add note to --exclude=/proc/ vs. --exclude=/proc/* +- implement pre- and post-exec commands + o For the general backup process + o source specific diff --git a/doc/ccollect.text b/doc/ccollect.text index 4ee5a80..40ff541 100644 --- a/doc/ccollect.text +++ b/doc/ccollect.text @@ -122,15 +122,15 @@ The name you choose for the subdirectory describes the source. Each source has at least the following files: - - `source` (a text file containing the rsync compatible path to backup) + - `source` (a text file containing the `rsync` compatible path to backup) - `destination` (a link to the directory we should backup to) Additionally a source may have the following files: - - `verbose` whether to be verbose (passes -v to rsync) - - `very_verbose` be very verbose (-v also for mkdir, cp, rm) - - `exclude` exclude list for rsync. '\\n' seperated list. - - `rsync_options' extra options to pass to rsync + - `verbose` whether to be verbose (passes -v to `rsync`) + - `very_verbose` be very verbose (-v also for `mkdir`, `cp`, `rm`) + - `exclude` exclude list for `rsync`. '\\n' seperated list. + - `rsync_options' extra options to pass to `rsync` Example: -------------------------------------------------------------------------------- @@ -155,11 +155,11 @@ Example: Detailled description of "source" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -`source` describes a rsync compatible source (one line only). +`source` describes a `rsync` compatible source (one line only). For instance 'backup_user@foreign_host:/home/server/video'. -To use the rsync protocol without the ssh-tunnel, use -'rsync::USER@HOST/SRC'. For more information have a look at rsync(1). +To use the `rsync` protocol without the `ssh`-tunnel, use +'rsync::USER@HOST/SRC'. For more information have a look at `rsync`(1). Detailled description of "verbose" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^