Always use project specific drush when available

geerlingguy · Nov 16, 2016 · eea33ae · eea33ae
1 parent acbaa92
commit eea33ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
@@ -100,11 +100,6 @@
       set_fact:
         drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
 
-    - name: Update drush_path if drush is not available globally.
-      set_fact:
-        drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
-      when: "'drush' not in installed_extras"
-
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
     - include: tasks/www.yml

diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
@@ -1,4 +1,14 @@
 ---
+- name: Check if a project specific Drush binary exists.
+  stat: "path={{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+  register: drush_vendor_bin
+  ignore_errors: true
+
+- name: Use project specific Drush if available.
+  set_fact:
+    drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+  when: drush_vendor_bin.stat.exists
+
 - name: Check if site is already installed.
   command: >
     {{ drush_path }} status bootstrap