Merge pull request #67 from palantirnet/remove-custom-drush-wrapper

Remove custom drush wrapper
palantirnet · Jan 15, 2020 · c5a5096 · c5a5096
2 parents dda525d + 642e1bc
commit c5a5096
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## UNRELEASED
+
+### Changed
+
+* Removed the custom drush wrapper in ~/bin. Drush 9 handles this itself.
+
+### Updating from 2.5
+
+* This update does **not** require destroying your current vagrant box.
+* As a developer, you may want to:
+  1. From your Vagrant box, `rm ~/bin/drush`
+  2. Log out of your vagrant and then back in before continuing to work
+
 ## 2.5.0 - November 18, 2019
 
 ### Changed

diff --git a/conf/vagrant/provisioning/drupal8-skeleton.yml b/conf/vagrant/provisioning/drupal8-skeleton.yml
@@ -13,7 +13,6 @@
     - { role: vhost }
     - { role: https }
     - { role: solr }
-    - { role: drush }
     - { role: drupal-check }
     - { role: gulp }
     - { role: elnebuloso.nvm,

diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml
@@ -54,10 +54,18 @@
   when: provision_user.stat.exists
   tags: common
 
+- name: Add the ~/bin to the path
+  lineinfile: dest=/home/vagrant/.profile state=present line='export PATH="$PATH:$HOME/bin"'
+  tags: drush
+
 - name: Add the project's vendor/bin to the path
   lineinfile: dest=/home/vagrant/.profile state=present line='export PATH="$PATH:/var/www/{{ hostname }}/vendor/bin"'
   tags: common
 
+- name: Add the ~/bin to the zsh path
+  lineinfile: dest=/home/vagrant/.zshrc state=present create=yes line='export PATH="$PATH:$HOME/bin"'
+  tags: drush
+
 - name: Add $HOME/bin and the project's vendor/bin to the zsh path
   lineinfile: dest=/home/vagrant/.zshrc state=present create=yes line='export PATH="$PATH:$REPO/vendor/bin:$HOME/bin:/var/www/{{ hostname }}/vendor/bin"'
   tags: common

diff --git a/conf/vagrant/provisioning/roles/drush/bin/drush b/conf/vagrant/provisioning/roles/drush/bin/drush
diff --git a/conf/vagrant/provisioning/roles/drush/tasks/main.yml b/conf/vagrant/provisioning/roles/drush/tasks/main.yml