cvs: php4 /pear/scripts pear.in

ssb Wed Nov 7 04:25:39 2001 EDT Modified files: /php4/pear/scripts pear.in Log: * fix "list" command Index: php4/pear/scripts/pear.in diff -u php4/pear/scripts/pear.in:1.15 php4/pear/scripts/pear.in:1.16 --- php4/pear/scripts/pear.in:1.15 Mon Nov 5 20:05:28 2001 +++ php4/pear/scripts/pear.in Wed Nov 7 04:25:39 2001 @@ -119,7 +119,7 @@ } } -$verbose = $config->get("verbose"); +//$verbose = $config->get("verbose"); $script_dir = $config->get("php_dir"); $ext_dir = $config->get("ext_dir"); $doc_dir = $config->get("doc_dir"); @@ -151,14 +151,13 @@ case 'install': { include_once 'PEAR/Installer.php'; - $package = $options[1][2]; + $pkgfile = $options[1][2]; $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); + $installer->setErrorHandling(PEAR_ERROR_DIE, + basename($pkgfile) . ": %s\n"); $installer->debug = $verbose; - if (PEAR::isError($installer->Install($package))) { - print "\ninstall failed\n"; - } else { - print "install ok\n"; - } + $installer->install($pkgfile); + print "install ok\n"; break; } @@ -204,14 +203,13 @@ if ($j++ > 0) { print "\n"; } - printf("%-20s %-10s %-15s %s\n", - "Package", "Stable", "Lead", "Category"); + printf("%-20s %-10s %s\n", + "Package", "Version", "State"); print str_repeat("=", 75)."\n"; } $stable = $package['stable']; - printf("%-20s %-10s %-15s %s\n", $package['name'], - $stable ? $stable : "???", - $package['lead'], $package['category']); + printf("%-20s %-10s %s\n", $package['package'], + $package['version'], $package['release_state']); } break; }