[Fusionforge-commits] FusionForge branch Branch_5_3 updated. da8231567fbfe3f438053f70ea56201e4fd7cb70
Roland Mas
lolando at fusionforge.org
Wed Jul 30 14:44:35 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, Branch_5_3 has been updated
via da8231567fbfe3f438053f70ea56201e4fd7cb70 (commit)
from f70674946ebb8d24b424693bb7e7958d43974b43 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit da8231567fbfe3f438053f70ea56201e4fd7cb70
Author: Roland Mas <lolando at debian.org>
Date: Wed Jul 30 14:43:58 2014 +0200
More replacements of hardcoded paths
diff --git a/src/utils/install-apache.sh b/src/utils/install-apache.sh
index badedfb..086e838 100755
--- a/src/utils/install-apache.sh
+++ b/src/utils/install-apache.sh
@@ -71,7 +71,7 @@ then
fi
if [ -z "$GFORGE_ETC_SEARCH" ]
then
- GFORGE_ETC_SEARCH="/etc/gforge/httpd.conf"
+ GFORGE_ETC_SEARCH="$(forge_get_config config_path)/httpd.conf"
fi
if [ -z "$PHP_ETC_SEARCH" ]
then
diff --git a/tests/func/Testing/SeleniumGforge.php b/tests/func/Testing/SeleniumGforge.php
index 53ac75e..0268a5b 100644
--- a/tests/func/Testing/SeleniumGforge.php
+++ b/tests/func/Testing/SeleniumGforge.php
@@ -114,12 +114,12 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
protected function cron($cmd)
{
- $this->runCommand(RUN_JOB_PATH."forge_run_job $cmd");
+ $this->runCommand(RUN_JOB_PATH."/forge_run_job $cmd");
}
protected function cron_for_plugin($cmd, $plugin)
{
- $this->runCommand(RUN_JOB_PATH."forge_run_plugin_job $plugin $cmd");
+ $this->runCommand(RUN_JOB_PATH."/forge_run_plugin_job $plugin $cmd");
}
protected function reload_apache()
-----------------------------------------------------------------------
Summary of changes:
src/utils/install-apache.sh | 2 +-
tests/func/Testing/SeleniumGforge.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list