Merge remote-tracking branch 'simensen/vendor-bin-runnable'

2012-02-05 21:17:08 +01:00 · 2012-02-05 21:17:08 +01:00 · 4b18753ad6
parent 2262a3f864 8d0c2e0079
commit 4b18753ad6
1 changed files with 1 additions and 1 deletions
--- a/bin/composer
+++ b/bin/composer
@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php

-if (!@include __DIR__.'/../vendor/.composer/autoload.php') {
+if ((!@include __DIR__.'/../../../.composer/autoload.php') and (!@include __DIR__.'/../vendor/.composer/autoload.php')) {
    die('You must set up the project dependencies, run the following commands:
 wget http://getcomposer.org/composer.phar
 php composer.phar install