1 files changed, 36 insertions, 17 deletions

diff --git a/minimunin b/minimunin
index ce7a857..c42ce59 100755
--- a/minimunin
+++ b/minimunin
@@ -321,28 +321,47 @@ get_sys() {
     LANG=C LC_ALL=C ${SYSCTL} -n $@
 }
 
-env_for_plugin_from_config() {
-    unset in_sect
-    while read line; do
-        case ${line## } in
-            \[*\])  case [$1 in ${line%%]*}) in_sect=true;; *) unset in_sect ;; esac
-                    ;;
-            env.*)  [ "${in_sect}" ] || continue
-                    _pref=${line#*env.};
-                    printf "%s " ${_pref%% *}=\'${_pref#* }\'
-                    ;;
-        esac
-    done
-}
-
 call_plugin() {
     _param=$2
     _plug=`/usr/bin/find ${PLUGIN_DIR} \( -type l -or -type f \) -perm +111 -name $1 2>/dev/null | /usr/bin/head -n 1`
     [ -z "${_plug}" ] && return 1
 
-    _env=$( printf "%s\n" "${CONFIGS}" | env_for_plugin_from_config $1 )
-    eval env ${_env} ${_plug} ${_param}
-    return $?
+    unset in_sect _env _user _command
+    while read line; do
+        case ${line## } in
+            \[*\])    case [$1 in ${line%%]*}) in_sect=true;; *) unset in_sect ;; esac
+                      ;;
+            env.*)    [ "${in_sect}" ] || continue
+                      _pref=${line#*env.}
+                      _env="${env} ${_pref%% *}='${_pref#* }'"
+                      ;;
+            user )    _user=${line#*user }
+                      ;;
+            command ) _command=${line#*command }
+                      ;;
+        esac
+    done <<EOF
+${CONFIGS}
+EOF
+
+    if [ "${_command }" ]; then
+        # if the command is overridden, do a replace on %c
+        case ${_command} in *%c*) _command=${_command%%%c*}${_plug}${_command#*%c};; esac
+    else
+        # if not, just use the command
+        _command="${_plug}"
+    fi
+
+    # attach the config or fetch parameter
+    _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}'"
+
+    # prepend environment and run the command
+    ${_env} ${_command}
+
+    return 0
 }
 
 # After function definitions, main() can use them