util: Fix cmd function and never leak anything into the environment

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.util b/src/functions/functions.util
index d1e2a92b283490d5eb46854cc447704171808b16..80354f4d3778ae63c5a1f0f78e25a551b30f9571 100644 (file)
--- a/src/functions/functions.util
+++ b/src/functions/functions.util
@@ -476,14 +476,22 @@ cmd() {
 
        log DEBUG "Running command: ${cmd}"
 
-       if ! ${cmd}; then
-               local ret=$?
-
-               log DEBUG "Returned with code '${ret}'"
-               return ${ret}
-       fi
+       env -i -- \
+               HOME="${HOME}" \
+               PATH="${PATH}" \
+               TERM="${TERM}" \
+               ${cmd}
+       local ret=$?
 
-       return ${EXIT_OK}
+       case "${ret}" in
+               ${EXIT_OK})
+                       return ${EXIT_OK}
+                       ;;
+               *)
+                       log DEBUG "Returned with code '${ret}'"
+                       return ${ret}
+                       ;;
+       esac
 }
 
 cmd_quiet() {