ignore `$SHELL` in `shellify`

[folly.git] / folly / Shell.h

diff --git a/folly/Shell.h b/folly/Shell.h
index 56df3d278498dbd994bd2fe03f21fbe79a1beb2d..c7aca9b79194fc78f6ca81eaa954d8e58e1b3c27 100644 (file)
--- a/folly/Shell.h
+++ b/folly/Shell.h
@@ -51,8 +51,7 @@ std::string shellQuote(StringPiece argument) {
   * Create argument array for `Subprocess()` for a process running in a
   * shell.
   *
-  * The shell to use is taken from the environment variable $SHELL,
-  * or /bin/sh if $SHELL is unset.
+  * The shell to use is always going to be `/bin/sh`.
   *
   * The format string should always be a string literal to protect against
   * shell injections. Arguments will automatically be escaped with `'`.
@@ -63,14 +62,10 @@ template <typename... Arguments>
 std::vector<std::string> shellify(
     const StringPiece format,
     Arguments&&... arguments) {
-  const char* shell = getenv("SHELL");
-  if (!shell) {
-    shell = "/bin/sh";
-  }
   auto command = sformat(
       format,
       shellQuote(to<std::string>(std::forward<Arguments>(arguments)))...);
-  return {shell, "-c", command};
+  return {"/bin/sh", "-c", command};
 }
 
 } // folly