Compare commits
9 commits
Author | SHA1 | Date | |
---|---|---|---|
|
b50b3f64dc | ||
|
40dbfbd3a3 | ||
|
7d298d2b51 | ||
3687267dd7 | |||
|
2ca7598593 | ||
|
08cb857664 | ||
|
309d8dc773 | ||
fabdefad82 | |||
|
616b1d9e3e |
6 changed files with 19 additions and 6 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -14,3 +14,4 @@ doc/*.xml
|
|||
doc/*/*.xml
|
||||
*.texi
|
||||
*.fo
|
||||
*.lock
|
||||
|
|
6
Makefile
6
Makefile
|
@ -235,13 +235,13 @@ test-interval-changing: $(CCOLLECT_SOURCE) test-dir-source test-dir-destination-
|
|||
test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "0" || { cat ${TEST_LOG_FILE}; exit 1; }
|
||||
printf "3" > ./test/conf/sources/local-with-interval/intervals/daily
|
||||
for x in 1 2 3 4 5; do CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} daily local-with-interval; done
|
||||
test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "3" || { cat ${TEST_LOG_FILE}; exit 1; }
|
||||
test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "4" || { cat ${TEST_LOG_FILE}; exit 1; }
|
||||
printf "5" > ./test/conf/sources/local-with-interval/intervals/daily
|
||||
for x in 1 2 3 4 5 6 7; do CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} daily local-with-interval; done
|
||||
test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "5" || { cat ${TEST_LOG_FILE}; exit 1; }
|
||||
test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "6" || { cat ${TEST_LOG_FILE}; exit 1; }
|
||||
printf "4" > ./test/conf/sources/local-with-interval/intervals/daily
|
||||
for x in 1 2 3 4 5 6; do CCOLLECT_CONF=./test/conf ./ccollect -l ${TEST_LOG_FILE} daily local-with-interval; done
|
||||
test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "4" || { cat ${TEST_LOG_FILE}; exit 1; }
|
||||
test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "5" || { cat ${TEST_LOG_FILE}; exit 1; }
|
||||
printf "3" > ./test/conf/sources/local-with-interval/intervals/daily
|
||||
@printf "\nInterval changing test ended successfully\n"
|
||||
|
||||
|
|
14
ccollect
14
ccollect
|
@ -45,8 +45,8 @@ TMP="$(mktemp "/tmp/${__myname}.XXXXXX")"
|
|||
export TMP
|
||||
CONTROL_PIPE="/tmp/${__myname}-control-pipe"
|
||||
|
||||
VERSION="2.9"
|
||||
RELEASE="2020-05-25"
|
||||
VERSION="2.10"
|
||||
RELEASE="2020-08-26"
|
||||
HALF_VERSION="ccollect ${VERSION}"
|
||||
FULL_VERSION="ccollect ${VERSION} (${RELEASE})"
|
||||
|
||||
|
@ -861,6 +861,16 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
|
|||
_techo "Warning: rsync failed with return code $ret."
|
||||
fi
|
||||
|
||||
#
|
||||
# Create symlink to newest backup
|
||||
#
|
||||
# shellcheck disable=SC2010
|
||||
latest_dir="$(ls -${TSORT}p1 "${ddir}" | grep '/$' | head -n 1)" || \
|
||||
_exit_err "Failed to list content of ${ddir}."
|
||||
|
||||
ln -snf "${ddir}/${latest_dir}" "${ddir}/current" || \
|
||||
_exit_err "Failed to create 'current' symlink."
|
||||
|
||||
#
|
||||
# post_exec
|
||||
#
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
ccollect - Installing, Configuring and Using
|
||||
============================================
|
||||
Nico Schottelius <nico-ccollect__@__schottelius.org>
|
||||
2.9, for ccollect 2.9, Initial Version from 2006-01-13
|
||||
2.10, for ccollect 2.10, Initial Version from 2006-01-13
|
||||
:Author Initials: NS
|
||||
|
||||
|
||||
|
|
1
doc/changes/2.10
Normal file
1
doc/changes/2.10
Normal file
|
@ -0,0 +1 @@
|
|||
* Add 'current' symlink to backup destinations (Steffen Zieger)
|
1
doc/changes/next
Normal file
1
doc/changes/next
Normal file
|
@ -0,0 +1 @@
|
|||
* Fix 'current' symlink (Jun Futagawa)
|
Loading…
Reference in a new issue