extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix --exit-codes did not found (now used) exceptions

Browse Source
This commit is contained in:
Ralf Becker 2019-02-23 12:11:30 +01:00
parent 78028dfbda
commit d084bd0679
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
setup/setup-cli.php
View File

@ -6,9 +6,8 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package setup * @package setup
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2006-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2006-19 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/ */
use EGroupware\Api; use EGroupware\Api;
@ -117,6 +116,7 @@ switch($action)
list_exit_codes(); list_exit_codes();
break; break;
case '-h':
case '--help': case '--help':
case '--usage': case '--usage':
do_usage($arguments[0]); do_usage($arguments[0]);
@ -506,23 +506,15 @@ function do_usage($what='')
} }
if (!$what || !in_array($what,array('config','header','list'))) if (!$what || !in_array($what,array('config','header','list')))
{ {
echo '--help [config|header|list] '.lang('gives further options')."\n"; echo '--help|-h [config|header|list] '.lang('gives further options')."\n";
} }
} }
function fail($exit_code,$message)
{
echo $message."\n";
exit($exit_code);
}
/** /**
* List all exit codes used by the command line interface * List all exit codes used by the command line interface
* *
* The list is generated by "greping" this file for calls to the fail() function. * The list is generated by "greping" this file for thrown exceptions.
* Calls to fail() have to be in one line, to be recogniced! * Exceptions have to be in one line, to be recogniced!
*
* @todo we need to grep for the exceptions too!
*/ */
function list_exit_codes() function list_exit_codes()
{ {
@ -543,7 +535,7 @@ function list_exit_codes()
$content = file_get_contents($setup_dir.'/'.$file); $content = file_get_contents($setup_dir.'/'.$file);
$matches = null; $matches = null;
if (preg_match_all('/throw new (egw_exception[a-z_]*)\((.*),([0-9]+)\);/m',$content,$matches)) if (preg_match_all('/throw new (Api\\\\Exception[\\\\a-z_]*)\((.*),([0-9]+)\);/mi',$content,$matches))
{ {
//echo $file.":\n"; print_r($matches); //echo $file.":\n"; print_r($matches);
foreach($matches[3] as $key => $code) foreach($matches[3] as $key => $code)