Merge pull request #33 from villuorav/custom-bin-bash

Add possibility to change the shell binary

Author: schlessera

features/shell.feature

@@ -40,3 +40,24 @@ Feature: WordPress REPL
       bool(true)
       """
 
+  Scenario: Use custom shell path
+    Given a WP install
+
+    And a session file:
+      """
+      return true;
+      """
+
+    When I try `WP_CLI_CUSTOM_SHELL=/nonsense/path wp shell --basic < session`
+    Then STDOUT should be empty
+    And STDERR should contain:
+      """
+      Error: The shell binary '/nonsense/path' is not valid.
+      """
+
+    When I try `WP_CLI_CUSTOM_SHELL=/bin/bash wp shell --basic < session`
+    Then STDOUT should contain:
+      """
+      bool(true)
+      """
+    And STDERR should be empty

src/WP_CLI/REPL.php

@@ -2,6 +2,8 @@
 
 namespace WP_CLI;
 
+use WP_CLI;
+
 class REPL {
 
 	private $prompt;
@@ -95,6 +97,17 @@ private function prompt() {
 	private static function create_prompt_cmd( $prompt, $history_path ) {
 		$prompt = escapeshellarg( $prompt );
 		$history_path = escapeshellarg( $history_path );
+		if ( getenv( 'WP_CLI_CUSTOM_SHELL' ) ) {
+			$shell_binary = getenv( 'WP_CLI_CUSTOM_SHELL' );
+		} else {
+			$shell_binary = '/bin/bash';
+		}
+
+		if ( ! is_file( $shell_binary ) || ! is_readable( $shell_binary ) ) {
+			WP_CLI::error( "The shell binary '{$shell_binary}' is not valid. You can override the shell to be used through the WP_CLI_CUSTOM_SHELL environment variable." );
+		}
+
+		$shell_binary = escapeshellarg( $shell_binary );
 
 		$cmd = "set -f; "
 			. "history -r $history_path; "
@@ -105,7 +118,7 @@ private static function create_prompt_cmd( $prompt, $history_path ) {
 			. "history -w $history_path; "
 			. "echo \$LINE; ";
 
-		return '/bin/bash -c ' . escapeshellarg( $cmd );
+		return "{$shell_binary} -c " . escapeshellarg( $cmd );
 	}
 
 	private function set_history_file() {