Merge remote branch 'nico/master'

This commit is contained in:
Steven Armstrong 2011-03-28 17:08:46 +02:00
commit 1e42861ff4
26 changed files with 590 additions and 279 deletions

View file

@ -24,7 +24,7 @@
if [ -f "$__object/parameter/name" ]; then
name="$(cat "$__object/parameter/name")"
else
name="$__object_id"
name="/$__object_id"
fi
pgrep -x -f "$name" || true