diff --git a/Makefile b/Makefile index cfafa7a..8f7f688 100644 --- a/Makefile +++ b/Makefile @@ -43,8 +43,8 @@ path_dir=/usr/local/bin path_destination=${path_dir}/${CCOLLECT_DEST} # where to publish -host=home.schottelius.org -dir=/home/server/www/nico/unix.schottelius.org/www/ccollect/ +host=localhost +dir=/home/users/nico/privat/computer/net/netzseiten/www.nico.schottelius.org/src/software/ccollect docdir=${dir}/doc # diff --git a/README b/README index 401d778..5b63396 100644 --- a/README +++ b/README @@ -60,6 +60,6 @@ doc/man/ccollect.text Manpage in text format doc/man/ccollect.man Manpage in manpage format (generated) -------------------------------------------------------------------------------- -[0]: ccollect: http://unix.schottelius.org/ccollect/ +[0]: ccollect: http://www.nico.schottelius.org/software/ccollect/ [1]: rsnapshot: http://www.rsnapshot.org/ [2]: cconfig: http://nico.schotteli.us/papers/linux/cconfig/ diff --git a/ccollect.sh b/ccollect.sh index ae64b70..0dc7e9d 100755 --- a/ccollect.sh +++ b/ccollect.sh @@ -123,13 +123,14 @@ usage() echo " This is version ${VERSION}, released on ${RELEASE}" echo " (the first version was written on 2005-12-05 by Nico Schottelius)." echo "" - echo " Retrieve latest ccollect at http://unix.schottelius.org/ccollect/" + echo " Retrieve latest ccollect at http://www.nico.schottelius.org/software/ccollect/" exit 0 } # # need at least interval and one source or --all # + if [ $# -lt 2 ]; then if [ "$1" = "-V" -o "$1" = "--version" ]; then display_version diff --git a/doc/ccollect.text b/doc/ccollect.text index 124f060..29d7784 100644 --- a/doc/ccollect.text +++ b/doc/ccollect.text @@ -139,7 +139,7 @@ Quick start For those who do not want to read the whole long document: -------------------------------------------------------------------------------- -# get latest ccollect tarball from http://unix.schottelius.org/ccollect/ +# get latest ccollect tarball from http://www.nico.schottelius.org/software/ccollect/ # replace value for CCV with the current version export CCV=0.7.1 @@ -147,7 +147,7 @@ export CCV=0.7.1 # replace 'wget' with 'fetch' on bsd # holen=wget -"$holen" http://unix.schottelius.org/ccollect/ccollect-${CCV}.tar.bz2 +"$holen" http://www.nico.schottelius.org/software/ccollect/ccollect-${CCV}.tar.bz2 # extract the tarball, change to the newly created directory tar -xvjf ccollect-${CCV}.tar.bz2 @@ -212,7 +212,7 @@ Installing ccollect ~~~~~~~~~~~~~~~~~~~ For the installation you need at least - - the latest ccollect package (http://unix.schottelius.org/ccollect/) + - the latest ccollect package (http://www.nico.schottelius.org/software/ccollect/) - either `cp` and `chmod` or `install` - for more comfort: `make` - for rebuilding the generated documentation: additionally `asciidoc` diff --git a/doc/changes/next b/doc/changes/next index 0d7bd1f..8ce7b86 100644 --- a/doc/changes/next +++ b/doc/changes/next @@ -1,2 +1,3 @@ * Introduce consistenst time sorting (John Lawless) * Check for source connectivity before trying backup (John Lawless) +* Defensive programming patch (John Lawless) diff --git a/doc/man/ccollect.text b/doc/man/ccollect.text index d824717..84e95bb 100644 --- a/doc/man/ccollect.text +++ b/doc/man/ccollect.text @@ -52,7 +52,7 @@ Nico Schottelius RESOURCES --------- -Main web site: http://unix.schottelius.org/ccollect/[] +Main web site: http://www.nico.schottelius.org/software/ccollect/[] COPYING diff --git a/doc/man/ccollect_add_source.text b/doc/man/ccollect_add_source.text index 25e58a3..e3b9f83 100644 --- a/doc/man/ccollect_add_source.text +++ b/doc/man/ccollect_add_source.text @@ -66,7 +66,7 @@ Nico Schottelius RESOURCES --------- -Main web site: http://unix.schottelius.org/ccollect/[] +Main web site: http://www.nico.schottelius.org/software/ccollect/[] COPYING diff --git a/doc/man/ccollect_analyse_logs.text b/doc/man/ccollect_analyse_logs.text index 2638014..659ddbf 100644 --- a/doc/man/ccollect_analyse_logs.text +++ b/doc/man/ccollect_analyse_logs.text @@ -47,7 +47,7 @@ Nico Schottelius RESOURCES --------- -Main web site: http://unix.schottelius.org/ccollect/[] +Main web site: http://www.nico.schottelius.org/software/ccollect/[] COPYING diff --git a/doc/man/ccollect_delete_source.text b/doc/man/ccollect_delete_source.text index 9656271..2b7f300 100644 --- a/doc/man/ccollect_delete_source.text +++ b/doc/man/ccollect_delete_source.text @@ -48,7 +48,7 @@ Nico Schottelius RESOURCES --------- -Main web site: http://unix.schottelius.org/ccollect/[] +Main web site: http://www.nico.schottelius.org/software/ccollect/[] COPYING diff --git a/doc/man/ccollect_list_intervals.text b/doc/man/ccollect_list_intervals.text index 051b087..9df4121 100644 --- a/doc/man/ccollect_list_intervals.text +++ b/doc/man/ccollect_list_intervals.text @@ -39,7 +39,7 @@ Nico Schottelius RESOURCES --------- -Main web site: http://unix.schottelius.org/ccollect/[] +Main web site: http://www.nico.schottelius.org/software/ccollect/[] COPYING diff --git a/doc/man/ccollect_logwrapper.text b/doc/man/ccollect_logwrapper.text index ce1c5f6..8084c10 100644 --- a/doc/man/ccollect_logwrapper.text +++ b/doc/man/ccollect_logwrapper.text @@ -47,7 +47,7 @@ Nico Schottelius RESOURCES --------- -Main web site: http://unix.schottelius.org/ccollect/[] +Main web site: http://www.nico.schottelius.org/software/ccollect/[] COPYING diff --git a/release.sh b/release.sh index 976a5c4..ae095ec 100755 --- a/release.sh +++ b/release.sh @@ -33,8 +33,10 @@ DESCRIPTION="$1"; shift NAME=ccollect-${VERSION} TARNAME=${NAME}.tar.bz2 TARLOCAL=../${TARNAME} -DHOST=nico@home.schottelius.org -DDIR=www/unix.schottelius.org/www/ccollect/ +#DHOST=nico@home.schottelius.org +DHOST=nico@localhost +#DDIR=www/unix.schottelius.org/www/ccollect/ +DDIR=/home/users/nico/privat/computer/net/netzseiten/www.nico.schottelius.org/src/software/ccollect DESTINATION="$DHOST:$DDIR" set -e