cvs: php4 /pear/scripts pear-get.in pear.in
| From: | Thomas V.V.Cox | Date: | Sun, 06 Jan 2002 20:19:41 +0000 |
| Subject: | cvs: php4 /pear/scripts pear-get.in pear.in | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-1858@lists.php.net to get a copy of this message | ||
cox Sun Jan 6 15:19:41 2002 EDT
Modified files:
/php4/pear/scripts pear.in pear-get.in
Log:
use the new Console_Getopt::readPHPArgv() function to read args
Index: php4/pear/scripts/pear.in
diff -u php4/pear/scripts/pear.in:1.27 php4/pear/scripts/pear.in:1.28
--- php4/pear/scripts/pear.in:1.27 Sat Jan 5 12:18:23 2002
+++ php4/pear/scripts/pear.in Sun Jan 6 15:19:41 2002
@@ -49,16 +49,16 @@
error_reporting(E_ALL & ~E_NOTICE);
-PEAR::setErrorHandling(PEAR_ERROR_PRINT, "pear: %s\n");
-
-// {{{ config file and option parsing
-if (!isset($argv)) {
- die("Could not read cmd args (register_argc_argv=Off?)\n");
+$argv = Console_Getopt::readPHPArgv();
+if (PEAR::isError($argv)) {
+ die($argv->getMessage());
}
$options = Console_Getopt::getopt($argv, "c:C:d:D:h?sSqu:v");
if (PEAR::isError($options)) {
usage($options);
}
+
+PEAR::setErrorHandling(PEAR_ERROR_PRINT, "pear: %s\n");
if (OS_WINDOWS) {
$pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pearsys.ini';
Index: php4/pear/scripts/pear-get.in
diff -u php4/pear/scripts/pear-get.in:1.2 php4/pear/scripts/pear-get.in:1.3
--- php4/pear/scripts/pear-get.in:1.2 Sat Jan 5 12:20:08 2002
+++ php4/pear/scripts/pear-get.in Sun Jan 6 15:19:41 2002
@@ -46,16 +46,16 @@
error_reporting(E_ALL & ~E_NOTICE);
-PEAR::setErrorHandling(PEAR_ERROR_PRINT, "pear: %s\n");
-
-// {{{ config file and option parsing
-if (!isset($argv)) {
- die("Could not read cmd args (register_argc_argv=Off?)\n");
+$argv = Console_Getopt::readPHPArgv();
+if (PEAR::isError($argv)) {
+ die($argv->getMessage());
}
-$options = Console_Getopt::getopt($argv, "c:C:d:D:h?qu:v");
+$options = Console_Getopt::getopt($argv, "c:C:d:D:h?sSqu:v");
if (PEAR::isError($options)) {
usage($options);
}
+
+PEAR::setErrorHandling(PEAR_ERROR_PRINT, "pear: %s\n");
if (OS_WINDOWS) {
$pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pearsys.ini';