archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Added command level options

Browse source 
- Fix error handling for Getopt (it doesn't use raiseError)
This commit is contained in:
Tomas V.V.Cox 2002-03-21 20:55:41 +00:00
parent a7936eea78
commit 41a8a27676
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pear/scripts/pear.in
View file

@ -24,19 +24,20 @@ require_once "PEAR/Config.php";
require_once "PEAR/Command.php"; require_once "PEAR/Command.php";
require_once "Console/Getopt.php"; require_once "Console/Getopt.php";
error_reporting(E_ALL);
PEAR_Command::setUIType('CLI'); PEAR_Command::setUIType('CLI');
$all_commands = PEAR_Command::getCommands(); $all_commands = PEAR_Command::getCommands();
$cmd_options = PEAR_Command::getOptions();
$progname = basename($argv[0]); $progname = basename($argv[0]);
PEAR::setErrorHandling(PEAR_ERROR_DIE, "$progname: %s\n"); PEAR::setErrorHandling(PEAR_ERROR_DIE, "$progname: %s\n");
$argv = Console_Getopt::readPHPArgv(); $argv = Console_Getopt::readPHPArgv();
PEAR::pushErrorHandling(PEAR_ERROR_CALLBACK, 'usage'); // XXX change Getopt to use raiseError() ?
$options = Console_Getopt::getopt($argv, "c:C:d:D:h?sSqu:v"); $options = Console_Getopt::getopt($argv, "c:C:d:D:h?sSqu:v" . $cmd_options);
PEAR::popErrorHandling(); if (PEAR::isError($options)) {
usage($options);
}
$opts = $options[0]; $opts = $options[0];
@ -59,9 +60,10 @@ foreach ($opts as $opt) {
$config = &PEAR_Config::singleton($pear_user_config, $pear_system_config); $config = &PEAR_Config::singleton($pear_user_config, $pear_system_config);
$verbose = $config->get("verbose"); $verbose = $config->get("verbose");
$cmdopts = array();
foreach ($opts as $opt) { foreach ($opts as $opt) {
$param = $opt[1]; $param = !empty($opt[1]) ? $opt[1] : null;
switch ($opt[0]) { switch ($opt[0]) {
case 'd': case 'd':
list($key, $value) = explode('=', $param); list($key, $value) = explode('=', $param);
@ -86,6 +88,10 @@ foreach ($opts as $opt) {
case 'q': case 'q':
$config->set('verbose', $verbose - 1); $config->set('verbose', $verbose - 1);
break; break;
default:
// all non pear params goes to the command
$cmdopts[$opt[0]] = $param;
break;
} }
} }
@ -113,7 +119,7 @@ if (PEAR::isError($cmd)) {
} }
$cmdargs = array_slice($options[1], 2); $cmdargs = array_slice($options[1], 2);
$ok = $cmd->run($command, $cmdargs); $ok = $cmd->run($command, $cmdopts, $cmdargs);
if ($ok === false) { if ($ok === false) {
PEAR::raiseError("unknown command `$command'"); PEAR::raiseError("unknown command `$command'");
} }