.gitignore

@@ -14,4 +14,3 @@ doc/*.xml
 doc/*/*.xml
 *.texi
 *.fo
-*.lock

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 "4" || { cat ${TEST_LOG_FILE}; exit 1; }
+	test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "3" || { 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 "6" || { cat ${TEST_LOG_FILE}; exit 1; }
+	test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "5" || { 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 "5" || { cat ${TEST_LOG_FILE}; exit 1; }
+	test "$$(ls -1 /tmp/ccollect/backup-chint | wc -l)" -eq "4" || { cat ${TEST_LOG_FILE}; exit 1; }
 	printf "3" > ./test/conf/sources/local-with-interval/intervals/daily
 	@printf "\nInterval changing test ended successfully\n"
 

ccollect

@@ -868,7 +868,7 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
     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" || \
+    ln -snf "${ddir}${latest_dir}" "${ddir}current" || \
         _exit_err "Failed to create 'current' symlink."
 
     #

doc/changes/next

@@ -1 +0,0 @@
-* Fix 'current' symlink (Jun Futagawa)