extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-11 21:50:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings in Travis install and make failed install an error (no more || true)

Browse Source
This commit is contained in:
Ralf Becker 2016-07-19 14:01:56 +02:00
parent bd48d28094
commit 5b55f3ae12
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -69,8 +69,8 @@ before_script:
script: script:
- php doc/rpm-build/post_install.php - php doc/rpm-build/post_install.php
--source_dir `pwd` --start_db '' --autostart_db '' || true --source_dir `pwd` --start_db '' --autostart_db '' --start_webserver '' --webserver_user ''
- mysql -uroot -e 'show tables' egroupware || true - mysql -uroot -e 'show tables' egroupware
# Ubuntu has problems with #!/usr/bin/env php -dapc.enable=1, it stalls forever # Ubuntu has problems with #!/usr/bin/env php -dapc.enable=1, it stalls forever
- php -dapc.enable_cli=1 doc/test-cli.php - php -dapc.enable_cli=1 doc/test-cli.php
- ./doc/php_syntax_check.sh - ./doc/php_syntax_check.sh

12
doc/rpm-build/post_install.php
View File

@ -423,10 +423,12 @@ else
// fix egw_cache evtl. created by root, stoping webserver from accessing it // fix egw_cache evtl. created by root, stoping webserver from accessing it
fix_perms(); fix_perms();
// restart running Apache, to force APC to update changed sources and/or Apache configuration if (!empty($config['start_webserver']))
$output = array(); {
run_cmd(build_cmd('start_webserver', 'status').' && '.build_cmd('start_webserver', 'restart'), $output, true); // 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); exit($ret);
} }
@ -577,7 +579,7 @@ function fix_perms()
{ {
global $config; 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/chown -R '.$config['webserver_user'].' /tmp/egw_cache');
system('/bin/chmod 700 /tmp/egw_cache'); system('/bin/chmod 700 /tmp/egw_cache');