diff options
| author | intrigeri <intrigeri@boum.org> | 2011-08-17 12:00:16 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2011-08-17 12:15:37 +0200 |
| commit | e691eb7a10d1ed618cb670886340b55ad5b7686a (patch) | |
| tree | 25096a7863b793367146ac048d7e199dd4ce7240 | |
| parent | 52eb8d0c4b4b1d9f0777c6f0b9ff4d4a86858874 (diff) | |
| download | backupninja-e691eb7a10d1ed618cb670886340b55ad5b7686a.tar.gz backupninja-e691eb7a10d1ed618cb670886340b55ad5b7686a.tar.bz2 | |
Allow 'when = XXX' in sh jobs.
when=XXX did work already. This patch allow to write this with spaces around the
equal sign - as in every other backup.d/ file.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | examples/example.sh | 2 | ||||
| -rw-r--r-- | handlers/sh.in | 7 |
4 files changed, 15 insertions, 0 deletions
@@ -39,3 +39,4 @@ Jordi Mallach <jordi@debian.org> -- do not error when no jobs are configured Jacob Anawalt <jlanawalt@gmail.com> -- pg_dump format option Sergio Talens-Oliag <sto@debian.org> -- pipefail fixes Bruno Bigras <bigras.bruno@gmail.com> -- enable tar handler in the build system +casper -- Allow 'when = XXX' with spaces in .sh files. @@ -1,3 +1,8 @@ +version 0.9.10 -- UNRELEASED + handler changes: + sh: + . Allow 'when = XXX' with spaces (Redmine#2769). + Thanks to casper for the patch. version 0.9.9 -- May 15, 2011 backupninja changes . Use locking to avoid running concurrent instances of the same backup diff --git a/examples/example.sh b/examples/example.sh index f02f026..75b0162 100644 --- a/examples/example.sh +++ b/examples/example.sh @@ -1,2 +1,4 @@ +# Note: the spaces around the equal sign ('=') are optional. +when = saturdays at 05:30 dpkg --get-selections > /var/backups/dpkg-selections.txt diff --git a/handlers/sh.in b/handlers/sh.in index b070f3b..384ca52 100644 --- a/handlers/sh.in +++ b/handlers/sh.in @@ -5,4 +5,11 @@ # runs the file /etc/backup.d/scriptname.sh # +# No-op function so that 'when = XXX' can be written as such in +# backup.d/*.sh, i.e. with spaces around the equal sign - as in every +# other backup.d/ file. +function when() { + true +} + [ $test ] || ( . $1 ) |