mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 08:09:02 +01:00
fix warnings in Travis install and make failed install an error (no more || true)
This commit is contained in:
parent
84e8a497c1
commit
ff20dbe3c9
@ -37,9 +37,14 @@ before_script:
|
||||
- composer update phpunit/phpunit
|
||||
|
||||
script:
|
||||
- php doc/rpm-build/post_install.php
|
||||
--source_dir `pwd` --start_db '' --autostart_db '' --start_webserver '' --webserver_user ''
|
||||
- mysql -uroot -e 'show tables' egroupware
|
||||
# Ubuntu has problems with #!/usr/bin/env php -dapc.enable=1, it stalls forever
|
||||
- php -dapc.enable_cli=1 doc/test-cli.php
|
||||
- ./doc/php_syntax_check.sh
|
||||
- ./doc/test-cli.php
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.composer/cache
|
||||
- $HOME/.composer/cache
|
||||
|
@ -423,10 +423,12 @@ else
|
||||
// fix egw_cache evtl. created by root, stoping webserver from accessing it
|
||||
fix_perms();
|
||||
|
||||
// restart running Apache, to force APC to update changed sources and/or Apache configuration
|
||||
$output = array();
|
||||
run_cmd(build_cmd('start_webserver', 'status').' && '.build_cmd('start_webserver', 'restart'), $output, true);
|
||||
|
||||
if (!empty($config['start_webserver']))
|
||||
{
|
||||
// restart running Apache, to force APC to update changed sources and/or Apache configuration
|
||||
$output = array();
|
||||
run_cmd(build_cmd('start_webserver', 'status').' && '.build_cmd('start_webserver', 'restart'), $output, true);
|
||||
}
|
||||
exit($ret);
|
||||
}
|
||||
|
||||
@ -577,7 +579,7 @@ function fix_perms()
|
||||
{
|
||||
global $config;
|
||||
|
||||
if (file_exists('/tmp/egw_cache'))
|
||||
if (file_exists('/tmp/egw_cache') && !empty($config['webserver_user']))
|
||||
{
|
||||
system('/bin/chown -R '.$config['webserver_user'].' /tmp/egw_cache');
|
||||
system('/bin/chmod 700 /tmp/egw_cache');
|
||||
|
Loading…
Reference in New Issue
Block a user