Update gitignore

Improve 'current' symlink to backup destinations

See merge request ungleich-public/ccollect!16

.gitignore

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

.gitlab-ci.yml

@@ -3,18 +3,10 @@ stages:
 
 unit_tests:
     stage: test
-    before_script:
-        - 'apk update'
-        - 'apk add make rsync'
     script:
         - make test
 
 shellcheck:
     stage: test
-    before_script:
-        - 'apk update'
-        - 'apk add make'
-        - 'wget https://storage.googleapis.com/shellcheck/shellcheck-stable.linux.x86_64.tar.xz'
-        - 'tar xf shellcheck-stable.linux.x86_64.tar.xz && mv shellcheck-stable/shellcheck /usr/bin/'
     script:
         - make shellcheck

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"
 

ccollect

@@ -45,8 +45,8 @@ TMP="$(mktemp "/tmp/${__myname}.XXXXXX")"
 export TMP
 CONTROL_PIPE="/tmp/${__myname}-control-pipe"
 
-VERSION="2.8"
-RELEASE="2019-11-26"
+VERSION="2.10"
+RELEASE="2020-08-26"
 HALF_VERSION="ccollect ${VERSION}"
 FULL_VERSION="ccollect ${VERSION} (${RELEASE})"
 
@@ -824,6 +824,11 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
     rsync "$@" "${source}" "${destination_dir}"; ret=$?
     _techo "Finished backup (rsync return code: $ret)."
 
+    #
+    # export rsync return code, might be useful in post_exec
+    #
+    export rsync_return_code=$ret
+
     #
     # Set modification time (mtime) to current time, if sorting by mtime is enabled
     #
@@ -856,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
     #

doc/ccollect.text

@@ -1,7 +1,7 @@
 ccollect - Installing, Configuring and Using
 ============================================
 Nico Schottelius <nico-ccollect__@__schottelius.org>
-2.8, for ccollect 2.8, Initial Version from 2006-01-13
+2.10, for ccollect 2.10, Initial Version from 2006-01-13
 :Author Initials: NS
 
 

doc/changes/2.10

@@ -0,0 +1 @@
+* Add 'current' symlink to backup destinations (Steffen Zieger)

doc/changes/2.9

@@ -0,0 +1 @@
+* Make rsync return code available in post_exec (Steffen Zieger)

doc/changes/next

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