deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #180 from gabriel403/hotfix/composerHome

Browse source 
Hotfix/composer home
This commit is contained in:
Dan Cryer 2013-10-17 03:56:22 -07:00
commit 095bf9730d
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,3 +8,4 @@ config.php
.buildpath
.htaccess
PHPCI/config.yml
cache

4
PHPCI/Controller/PluginController.php
View file

@ -76,7 +76,7 @@ class PluginController extends \PHPCI\Controller
$this->setComposerJson($json);
if ($this->canInstall) {
shell_exec($this->composerPath . ' update --working-dir=' . APPLICATION_PATH . ' > /dev/null 2>&1 &');
shell_exec('COMPOSER_HOME='.APPLICATION_PATH . ' ' . $this->composerPath . ' update --working-dir=' . APPLICATION_PATH . ' > /' . APPLICATION_PATH . '/phpci_composer_remove.log 2>&1 &');
}
header('Location: ' . PHPCI_URL . 'plugin?r=' . $package);
@ -101,7 +101,7 @@ class PluginController extends \PHPCI\Controller
$this->setComposerJson($json);
if ($this->canInstall) {
shell_exec($this->composerPath . ' update --working-dir=' . APPLICATION_PATH . ' > /dev/null 2>&1 &');
shell_exec('COMPOSER_HOME='.APPLICATION_PATH . ' ' . $this->composerPath . ' update --working-dir=' . APPLICATION_PATH . ' > /' . APPLICATION_PATH . '/phpci_composer_install.log 2>&1 &');
header('Location: ' . PHPCI_URL . 'plugin?i=' . $package);
die;