From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 29 Oct 2008 01:12:49 +0000 (+0000)
Subject: * luci/app/statistics: fix syntax of collectd Exec plugin config
X-Git-Tag: 0.9.0~1050
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9f19574ae0ae6d4881c83245d487b42251ff9528;p=oweals%2Fluci.git

* luci/app/statistics: fix syntax of collectd Exec plugin config
---

diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig
index 7f0a05f5f..b62005ce1 100755
--- a/applications/luci-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-statistics/root/usr/bin/stat-genconfig
@@ -94,11 +94,17 @@ function config_exec( c )
 		for key, type in pairs({ Exec="collectd_exec_input", NotificationExec="collectd_exec_notify" }) do
 			if sections[s][".type"] == type then
 
-				cmd   = sections[s].cmdline
-				user  = sections[s].cmduser  or "nobody"
-				group = sections[s].cmdgroup or "nogroup"
+				cmd = sections[s].cmdline
 
-				str = str .. "\t" .. key .. " " .. user .. ":" .. group .. ' "' .. cmd .. "\"\n"
+                if cmd then
+                    cmd   = cmd:gsub("^%s+", ""):gsub("%s+$", "")
+                    user  = sections[s].cmduser  or "nobody"
+                    group = sections[s].cmdgroup
+
+                    str = str .. "\t" .. key .. ' "' ..
+                        user .. ( group and ":" .. group or "" ) .. '" "' ..
+                        cmd:gsub('%s+', '" "') .. '"\n'
+                end
 			end
 		end
 	end