ungleich-public/ccollect
6
0
Fork 1
Code Issues Pull requests 1 Projects Releases Wiki Activity

Allow interval per source to be overwritten to 0 to skip the source in this interval. #2

Open
skybeam wants to merge 3 commits from skybeam/ccollect:master into master
pull from: skybeam/ccollect:master
merge into: ungleich-public:master
Conversation 4 Commits 3 Files changed 2 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ebded3049a - Show all commits

4
ccollect
View file

@ -779,7 +779,7 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
if [ "${remove}" -gt 0 ]; then if [ "${remove}" -gt 0 ]; then
_techo "Removing ${remove} backup(s)..." _techo "Removing ${remove} backup(s)..."
if [ -z "${ls_rm_exclude}" -o ${c_interval} -le 0 ]; then if [ -z "${ls_rm_exclude}" -o ${c_interval} -eq 0 ]; then
nico commented 2023-01-15 21:15:39 +00:00
Outdated
Review
Copy link

If we want to match 0, we should do -eq 0, otherwise the documentation will need to be adjusted.

If we want to match 0, we should do `-eq 0`, otherwise the documentation will need to be adjusted.
skybeam commented 2023-01-15 21:18:31 +00:00
Outdated
Review
Copy link

Fine with me, usually errors are positive integers and I learned never ever to match numbers with "eq" - but for integers here it might be ok, so feel free to use -eq.

Fine with me, usually errors are positive integers and I learned never ever to match numbers with "eq" - but for integers here it might be ok, so feel free to use -eq.
# shellcheck disable=SC2010 # shellcheck disable=SC2010
ls -${TSORT}1r | grep "^${INTERVAL}\\." | head -n "${remove}" > "${TMP}" || \ ls -${TSORT}1r | grep "^${INTERVAL}\\." | head -n "${remove}" > "${TMP}" || \
_exit_err "Listing old backups failed" _exit_err "Listing old backups failed"
@ -796,7 +796,7 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
# #
# Skip backup of this source if interval is zero. # Skip backup of this source if interval is zero.
# #
if [ ${c_interval} -le 0 ]; then if [ ${c_interval} -eq 0 ]; then
nico commented 2023-01-15 21:15:47 +00:00
Outdated
Review
Copy link

Same here

Same here
_techo "Skipping backup for this interval." _techo "Skipping backup for this interval."
exit 0 exit 0
fi fi