From 26e909a1a0260f0a2ab1cd5aa4c427dc8be4ff71 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sun, 5 Feb 2012 21:23:52 +0100
Subject: [PATCH] Apply nested-autoload support to all relevant files

---
 bin/compile         | 9 ++++-----
 bin/composer        | 9 ++++-----
 tests/bootstrap.php | 6 ++++++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/bin/compile b/bin/compile
index 62e111228..bd8426693 100755
--- a/bin/compile
+++ b/bin/compile
@@ -1,11 +1,10 @@
 #!/usr/bin/env php
 <?php
 
-if (!@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
-');
+if ((!@include __DIR__.'/../../../.composer/autoload.php') && (!@include __DIR__.'/../vendor/.composer/autoload.php')) {
+    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
+        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
+        'php composer.phar install'.PHP_EOL);
 }
 
 use Composer\Compiler;
diff --git a/bin/composer b/bin/composer
index 735e84152..286660788 100755
--- a/bin/composer
+++ b/bin/composer
@@ -1,11 +1,10 @@
 #!/usr/bin/env php
 <?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
-');
+if ((!@include __DIR__.'/../../../.composer/autoload.php') && (!@include __DIR__.'/../vendor/.composer/autoload.php')) {
+    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
+        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
+        'php composer.phar install'.PHP_EOL);
 }
 
 use Composer\Console\Application;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b2743bb41..3c891e9d8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,6 +10,12 @@
  * file that was distributed with this source code.
  */
 
+if ((!$loader = @include __DIR__.'/../../../.composer/autoload.php') && (!$loader = @include __DIR__.'/../vendor/.composer/autoload.php')) {
+    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
+        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
+        'php composer.phar install'.PHP_EOL);
+}
+
 $loader = require __DIR__.'/../vendor/.composer/autoload.php';
 $loader->add('Composer\Test', __DIR__);
 $loader->register();