1 files changed, 13 insertions, 6 deletions

diff --git a/minimunin b/minimunin
index c42ce59..cc173c9 100755
--- a/minimunin
+++ b/minimunin
@@ -1,4 +1,10 @@
 #!/bin/sh
+#
+# This script was written by erdgeist@erdgeist.org
+# The code is released under the beer ware license, this means do whatever you
+# want with it, as long as you leave this notice along with the code.
+# Should we meet some day and you find the code is worth it, let's enjoy a beer
+# together.
 
 PLUGIN_DIR=/usr/local/etc/minimunin-plugins
 CONFIG_DIR=/usr/local/etc/minimunin-configs
@@ -335,17 +341,18 @@ call_plugin() {
                       _pref=${line#*env.}
                       _env="${env} ${_pref%% *}='${_pref#* }'"
                       ;;
-            user )    _user=${line#*user }
+            user\ *)  _user=${line#*user }
                       ;;
-            command ) _command=${line#*command }
+            command\ *) _command=${line#*command }
                       ;;
         esac
     done <<EOF
 ${CONFIGS}
+
 EOF
 
-    if [ "${_command }" ]; then
-        # if the command is overridden, do a replace on %c
+    if [ "${_command}" ]; then
+        # if the command is overridden, do a replace on %c -- I wonder if multiple substitutions are intended
         case ${_command} in *%c*) _command=${_command%%%c*}${_plug}${_command#*%c};; esac
     else
         # if not, just use the command
@@ -356,10 +363,10 @@ EOF
     _command="${_command} ${_param}"
 
     # if we're required to switch the user and able to do so (root) use su to become this user
-    [ "${_user}" -a `id -u` -eq 0 ] && _command="/usr/bin/su ${user} -c '${_command}'"
+    [ "${_user}" -a `id -u` -eq 0 ] && _command="/usr/bin/su -m ${_user} -c '${_command}'"
 
     # prepend environment and run the command
-    ${_env} ${_command}
+    eval env ${_env} ${_command}
 
     return 0
 }