From 24602766aac6179f147c4d05dc69de1e42a0d796 Mon Sep 17 00:00:00 2001 From: Gabriel Baker Date: Thu, 17 Oct 2013 08:50:37 +0100 Subject: [PATCH] fix for composer_home being missing --- .gitignore | 1 + PHPCI/Controller/PluginController.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3904ba6d..2f2601ea 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ config.php .buildpath .htaccess PHPCI/config.yml +cache \ No newline at end of file diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php index 22b25bfc..1facce06 100644 --- a/PHPCI/Controller/PluginController.php +++ b/PHPCI/Controller/PluginController.php @@ -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($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;