Fixes acquia#1328: Spaces in project paths break BLT.

grasmash · Apr 24, 2017 · 9186971 · 9186971
1 parent ea5d4a1
commit 9186971
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Robo/Commands/Blt/DoctorCommand.php b/src/Robo/Commands/Blt/DoctorCommand.php
@@ -79,7 +79,7 @@ protected function executeCommandInDrupalVm($command) {
   protected function executeDoctorOnHost($alias) {
     $drush_bin = $this->getConfigValue('composer.bin') . '/drush';
     $include_dir = $this->getConfigValue('blt.root') . '/drush';
-    $result = $this->taskExec("$drush_bin @$alias --include=$include_dir blt-doctor")
+    $result = $this->taskExec("'$drush_bin' @$alias --include='$include_dir' blt-doctor")
       ->dir($this->getConfigValue('docroot'))
       ->detectInteractive()
       ->run();

diff --git a/template/drush.wrapper b/template/drush.wrapper
@@ -28,13 +28,13 @@
 # `../vendor/bin/drush.launcher --local $@` is a common variant for
 # composer-managed Drupal sites.
 #
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "`dirname $0`"
 
-if [ ! -f ${DIR}/vendor/drush/drush/drush.launcher ]; then
+if [ ! -f "${DIR}/vendor/drush/drush/drush.launcher" ]; then
   echo >&2 "Drush was not found in this project's vendor directory. You can install it by typing:"
   echo >&2 "composer install"
   exit 1
 fi
 
-vendor/drush/drush/drush.launcher --config=${DIR}/drush/drushrc.php --alias-path=${DIR}/drush/site-aliases "$@"
+vendor/drush/drush/drush.launcher --config="${DIR}/drush/drushrc.php" --alias-path="${DIR}/drush/site-aliases" "$@"