Progress on drush-ops#2090 - runserver/d8-rs-router.php can't find in…

…dex.php at end.
mikeker · Aug 4, 2017 · 83d642e · 83d642e
1 parent dd7f9f1
commit 83d642e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/commands/runserver/d8-rs-router.php b/commands/runserver/d8-rs-router.php
@@ -31,6 +31,6 @@ function runserver_env($key) {
 // See https://github.com/drush-ops/drush/issues/2033 for more information.
 $_SERVER['SCRIPT_NAME'] = '/index.php';
 
-// Include the main index.php and let core take over.
+// Include the main index.php and let Drupal take over.
 // n.b. Drush sets the cwd to the Drupal root during bootstrap.
 include 'index.php';
diff --git a/commands/runserver/runserver.drush.inc b/commands/runserver/runserver.drush.inc
@@ -137,7 +137,8 @@ function drush_core_runserver($uri = NULL) {
   else {
     $extra = ' --define auto_prepend_file="' . __DIR__ . '/runserver-prepend.php"';
   }
-  drush_shell_exec_interactive('%s -S ' . $addr . ':' . $uri['port'] . $extra, drush_get_option('php', 'php'));
+  $root = \Drush::bootstrapManager()->getRoot();
+  drush_shell_exec_interactive('cd %s && %s -S ' . $addr . ':' . $uri['port']. $extra, $root, drush_get_option('php', 'php'));
 }
 
 /**