From 4d81bb451c2cc8d5ffac5cf4ad64d524ae55c66f Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 24 Jun 2008 19:53:36 +0000
Subject: [PATCH] fixed catifexec function to actually work, also now takes
arguments that are passed, thanks to a report from John Hallam
---
ChangeLog | 2 ++
handlers/sys.in | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b56cab9a..df24adcb 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 2c48883c..9e6343f7 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
}
--
GitLab