From d7714983c32ebc8d062c80ee73c228095d2fca56 Mon Sep 17 00:00:00 2001
From: Beau Simensen <beau@dflydev.com>
Date: Thu, 19 Jan 2012 22:24:50 -0800
Subject: [PATCH 1/2] Fallback to include `vendor/.composer/autoload.php` for
 `bin/composer`

When Composer is a dependency for a project the `vendor/bin/composer`
script will not run as it is looking for `__DIR__.'/../vendor'` which
likely will not exist. What I believe is intended is for the script
to include the packages `vendor/.composer/autoload.php`.
---
 bin/composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/composer b/bin/composer
index 8062757f3..b997cff8f 100755
--- 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__.'/../vendor/.composer/autoload.php') and (!@include '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

From 8d0c2e007950012cab47c876892fce5d332b2293 Mon Sep 17 00:00:00 2001
From: Beau Simensen <beau@dflydev.com>
Date: Sun, 22 Jan 2012 10:37:28 -0800
Subject: [PATCH 2/2] Check for vendor differently for "installs as a
 dependency" case

---
 bin/composer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/composer b/bin/composer
index b997cff8f..735e84152 100755
--- a/bin/composer
+++ b/bin/composer
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-if ((!@include __DIR__.'/../vendor/.composer/autoload.php') and (!@include '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