#1375: Fixed busted drush global-local site handoff

lando · Feb 2, 2019 · fc64beb · fc64beb
1 parent 2450583
commit fc64beb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/docs/changelog/2019.md b/docs/changelog/2019.md
@@ -12,6 +12,7 @@ v3.0.0-rc.3 - [Febraury 3, 2019](https://github.com/lando/lando/releases/tag/v3.
 
 * Fixed `postgres` config loading preventing outside connections [#1379](https://github.com/lando/lando/issues/1379)
 * Fixed busted auto-naming on Windows deploy [#1375](https://github.com/lando/lando/issues/1375)
+* Fixed busted `drush` global-local handoff on Pantheon [#1375](https://github.com/lando/lando/issues/1375)
 
 v3.0.0-rc.2 - [Febraury 1, 2019](https://github.com/lando/lando/releases/tag/v3.0.0-rc.2)
 --------------------------------

diff --git a/examples/drupal8/README.md b/examples/drupal8/README.md
@@ -69,6 +69,11 @@ lando composer require drupal/console:~1.0 --prefer-dist --optimize-autoloader
 # Should have drupal console
 cd drupal8
 lando drupal -V
+
+# Should be able to handoff to sitelocal drush without issue
+cd drupal8
+lando composer require drush/drush
+lando rebuild -y
 ```
 
 Destroy tests

diff --git a/plugins/lando-pantheon/lib/utils.js b/plugins/lando-pantheon/lib/utils.js
@@ -107,7 +107,7 @@ const getPantheonSettings = options => ({
 exports.getPantheonBuildSteps = framework => {
   if (framework === 'wordpress') return [getPhar(wpCliUrl, '/tmp/wp-cli.phar', '/usr/local/bin/wp', wpStatusCheck)];
   else {
-    const build = [getDrush(DRUSH_VERSION, ['/tmp/drush.phar', 'core-status'])];
+    const build = [getDrush(DRUSH_VERSION, ['drush', 'status'])];
     if (framework === 'drupal8') {
       build.push(getPhar(
         'https://drupalconsole.com/installer',

diff --git a/plugins/lando-recipes/recipes/backdrop/builder.js b/plugins/lando-recipes/recipes/backdrop/builder.js
@@ -66,7 +66,7 @@ module.exports = {
           via: 'cli',
           overrides: {image: 'devwithlando/php:5.5-fpm'},
           build_internal: [
-            utils.getDrush(options.drush, ['/tmp/drush.phar', 'core-status']),
+            utils.getDrush(options.drush, ['drush', 'status']),
             backdrushInstall(options.backdrush),
           ],
         });

diff --git a/plugins/lando-recipes/types/drupaly/builder.js b/plugins/lando-recipes/types/drupaly/builder.js
@@ -40,7 +40,7 @@ module.exports = {
       if (!_.has(options, 'drush')) options.drush = (options.php === '5.3') ? DRUSH7 : DRUSH8;
       // Add the drush install command
       if (!_.isNull(semver.valid(options.drush)) && semver.major(options.drush) === 8) {
-        options.build.unshift(utils.getDrush(options.drush, ['/tmp/drush.phar', 'core-status']));
+        options.build.unshift(utils.getDrush(options.drush, ['drush', 'status']));
       } else if (options.drush !== false) {
         options.composer['drush/drush'] = options.drush;
       }