diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-05-26 15:46:33 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-05-26 15:46:33 +0200 |
| commit | 0996ad0da65861ddd75fc2d862defaaa4ccf551d (patch) | |
| tree | 8f1fd2dae8266f250194ef4c437c7d162f9816f2 /composer-rpm.patch | |
| parent | 9c1b62e9888907bdb311b45a271e6a41306bcd85 (diff) | |
composer-1.0.0-0.5.20150525git69210d5
Diffstat (limited to 'composer-rpm.patch')
| -rw-r--r-- | composer-rpm.patch | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch index c40e7ef..548ff70 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,20 +1,24 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2015-02-25 20:44:34.000000000 +0100 -+++ ./bin/composer 2015-02-26 10:25:16.012610034 +0100 -@@ -1,11 +1,11 @@ --#!/usr/bin/env php -+#!/usr/bin/env php - <?php - - if (PHP_SAPI !== 'cli') { +--- ./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') { 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'; - + use Composer\Console\Application; - + diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php --- ./src/Composer/Json/JsonFile.php.rpm 2015-02-25 20:44:34.000000000 +0100 +++ ./src/Composer/Json/JsonFile.php 2015-02-26 10:25:16.012610034 +0100 |