summaryrefslogtreecommitdiffstats
path: root/composer-rpm.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-06-15 08:40:26 +0200
committerRemi Collet <fedora@famillecollet.com>2015-06-15 08:40:26 +0200
commit0db56868fd534aefea804fa7dc4c7437da5b3c65 (patch)
treea3f8b93adbda9f2aef603cc3fdef131274f5a5d8 /composer-rpm.patch
parent2cd2e232e3f8cfa99c5c3a7bccb5254056357991 (diff)
composer-1.0.0-0.5.20150614git8e9659b
Diffstat (limited to 'composer-rpm.patch')
-rw-r--r--composer-rpm.patch13
1 files changed, 2 insertions, 11 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 548ff70..858abb1 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,21 +1,12 @@
diff -up ./bin/composer.rpm ./bin/composer
--- ./bin/composer.rpm 2015-05-25 15:29:26.000000000 +0200
+++ ./bin/composer 2015-05-26 15:36:46.984350206 +0200
-@@ -5,7 +5,16 @@ if (PHP_SAPI !== 'cli') {
+@@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
}
-require __DIR__.'/../src/bootstrap.php';
-+// Ensure correct include_path for RHSCL
-+$inc = get_include_path();
-+$dirs = explode(':', $inc);
-+if (!in_array('/usr/share/php', $dirs)) {
-+ $dirs[] = '/usr/share/php';
-+ set_include_path(implode(':', $dirs));
-+}
-+unset ($inc, $dirs);
-+
-+require 'Composer/autoload.php';
++require '/usr/share/php/Composer/autoload.php';
use Composer\Console\Application;