Change ShellManager to return both stdout and the return value in a pair

1 files changed, 4 insertions, 10 deletions

diff --git a/src/shell_manager.hh b/src/shell_manager.hh
index 60b9b13f..fde507b6 100644
--- a/src/shell_manager.hh
+++ b/src/shell_manager.hh
@@ -20,16 +20,10 @@ class ShellManager : public Singleton<ShellManager>
 public:
     ShellManager();
 
-    String eval(StringView cmdline, const Context& context,
-                ConstArrayView<String> params,
-                const EnvVarMap& env_vars,
-                int* exit_status = nullptr);
-
-    String pipe(StringView input,
-                StringView cmdline, const Context& context,
-                ConstArrayView<String> params,
-                const EnvVarMap& env_vars,
-                int* exit_status = nullptr);
+    std::pair<String, int> eval(StringView cmdline, const Context& context,
+                                StringView input = {},
+                                ConstArrayView<String> params = {},
+                                const EnvVarMap& env_vars = EnvVarMap{});
 
     void register_env_var(StringView regex, EnvVarRetriever retriever);
     String get_val(StringView name, const Context& context) const;