Merge pull request #449 from roots/remove-composer-from-path

Fixes #374 - Remove composer vendor/bin from $PATH
roots · Dec 28, 2015 · e1e3b77 · e1e3b77
2 parents 790265f + 8e7fe9e
commit e1e3b77
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Fixes #374 - Remove composer vendor/bin from $PATH ([#449](https://github.com/roots/trellis/pull/449))
 * Refactor hosts files ([#313](https://github.com/roots/trellis/pull/313))
 * Fixes #436 - Let WP handle 404s for PHP files ([#448](https://github.com/roots/trellis/pull/448))
 * Fixes #297 - Use `php_flag` vs `php_admin_flag` ([#447](https://github.com/roots/trellis/pull/447))

diff --git a/roles/composer/tasks/main.yml b/roles/composer/tasks/main.yml
@@ -10,13 +10,6 @@
   register: composer_update_result
   changed_when: composer_update_result | success and 'already using composer version' not in composer_update_result.stderr
 
-- name: add Composer vendor binary path
-  lineinfile:
-    dest: /etc/environment
-    regexp: ^PATH="(((?!:./vendor/bin).)*)"
-    line: PATH="\1:./vendor/bin"
-    backrefs: yes
-
 - name: Composer config github-oauth
   command: composer config -g github-oauth.github.com {{ composer_github_oauth_token }}
   when: composer_github_oauth_token is defined