diff --git a/.travis.yml b/.travis.yml index cb14fdd3c1..f81ae31788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,6 +62,7 @@ before_script: # create data directory - sudo mkdir /var/lib/egroupware - sudo chown travis /var/lib/egroupware + - ln -s /var/lib/egroupware/header.inc.php script: # install egroupware using MariaDB as domain "default" diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php index 5de4590869..b2a46b0916 100755 --- a/doc/rpm-build/post_install.php +++ b/doc/rpm-build/post_install.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/bin/env php PHP_BINARY, - 'source_dir' => '/usr/share/egroupware', + 'source_dir' => realpath(__DIR__.'/../..'), 'data_dir' => '/var/lib/egroupware', 'header' => '$data_dir/header.inc.php', // symlinked to source_dir by rpm 'setup-cli' => '$source_dir/setup/setup-cli.php', @@ -404,7 +404,8 @@ if (!isset($GLOBALS['egw_domain']) || $config['domain'] !== 'default' && !isset if (empty($config['db_root_pw'])) { - echo "*** Database has no root password set, please fix that immediatly: mysqladmin -u root password NEWPASSWORD\n\n"; + echo "*** Database has no root password set, please fix that immediatly". + (substr($config['db_type'], 0, 5) === 'mysql' ? ": mysqladmin -u root password NEWPASSWORD\n\n" : "!\n\n"); } } else