aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-06-24 19:53:36 +0000
committerMicah Anderson <micah@riseup.net>2008-06-24 19:53:36 +0000
commit4d81bb451c2cc8d5ffac5cf4ad64d524ae55c66f (patch)
tree6dfa52e657a7e303b67ffdd526d4e2adfab6ca85
parent33ff4f7506fcaab09fd7ad898507f37b7777ba8f (diff)
downloadbackupninja-4d81bb451c2cc8d5ffac5cf4ad64d524ae55c66f.tar.gz
backupninja-4d81bb451c2cc8d5ffac5cf4ad64d524ae55c66f.tar.bz2
fixed catifexec function to actually work, also now takes arguments that are passed, thanks to a report from John Hallam
-rw-r--r--ChangeLog2
-rwxr-xr-xhandlers/sys.in10
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b56cab9..df24adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,8 @@ version 0.9.6 -- unreleased
dup handler, with the new vsnames configuration option ; (Closes: Trac#45)
. add support for capturing the package debconf selection states using
debconf-get-selections
+ . fixed catifexec function to actually work, also now passes the arguments
+ given to catifexec() to the called command (Thanks John Hallam!)
version 0.9.5 -- December 2, 2007
backupninja changes
diff --git a/handlers/sys.in b/handlers/sys.in
index 2c48883..9e6343f 100755
--- a/handlers/sys.in
+++ b/handlers/sys.in
@@ -188,10 +188,12 @@ catiffile () {
}
catifexec () {
- echo $HASHES >> $sysreportfile
- echo "# $STATUS" >> $sysreportfile
- echo $HASHES >> $sysreportfile
- $1 >> $sysreportfile 2>&1 || info "executing of $1 failed"
+ if [ -x $1 ]; then
+ echo $HASHES >> $sysreportfile
+ echo "# $STATUS" >> $sysreportfile
+ echo $HASHES >> $sysreportfile
+ $* >> $sysreportfile 2>&1 || info "executing of $1 failed"
+ fi
}