cvs: php4 /pear Makefile.in /pear/scripts pear-get.in pear.in pearcmd-common.php pearcmd-help.php pearcmd-info.php pearcmd-install.php
pearcmd-list.php pearcmd-package.php pearcmd-remote-list.php pearcmd-show-config.php pearcmd-uninstall.php
| From: | Stig Bakken | Date: | Wed, 30 Jan 2002 12:20:12 +0000 |
| Subject: | cvs: php4 /pear Makefile.in /pear/scripts pear-get.in pear.in pearcmd-common.php pearcmd-help.php pearcmd-info.php pearcmd-install.php pearcmd-list.php pearcmd-package.php pearcmd-remote-list.php pearcmd-show-config.php pearcmd-uninstall.php |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-2241@lists.php.net to get a copy of this message | ||
ssb Wed Jan 30 07:20:12 2002 EDT
Added files:
/php4/pear/scripts pearcmd-common.php pearcmd-help.php
pearcmd-info.php pearcmd-install.php
pearcmd-list.php pearcmd-package.php
pearcmd-remote-list.php pearcmd-show-config.php
pearcmd-uninstall.php
Modified files:
/php4/pear Makefile.in
/php4/pear/scripts pear-get.in pear.in
Log:
* modularize "pear" and "pear-get" commands somewhat. checking options
etc. is done for both in pearcmd-common.php.
Index: php4/pear/Makefile.in diff -u php4/pear/Makefile.in:1.101 php4/pear/Makefile.in:1.102 --- php4/pear/Makefile.in:1.101 Mon Jan 21 13:25:04 2002 +++ php4/pear/Makefile.in Wed Jan 30 07:20:11 2002 @@ -83,6 +83,17 @@ System.php \ XML/Parser.php +PEAR_COMMAND_LIBS=\ + pearcmd-common.php \ + pearcmd-help.php \ + pearcmd-info.php \ + pearcmd-install.php \ + pearcmd-list.php \ + pearcmd-package.php \ + pearcmd-remote-list.php \ + pearcmd-show-config.php \ + pearcmd-uninstall.php + install-data-local: @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ for i in $(PEAR_SUBDIRS); do \ @@ -131,6 +142,10 @@ for prog in phpextdist; do \ echo "Installing program: $$prog"; \ $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ + done; \ + for lib in $(PEAR_COMMAND_LIBS); do \ + echo "Installing program library: $$lib"; \ + $(INSTALL) -m 755 $(srcdir)/scripts/$$lib $(INSTALL_ROOT)$(bindir)/$$lib; \ done HEADER_DIRS = \ Index: php4/pear/scripts/pear-get.in diff -u php4/pear/scripts/pear-get.in:1.3 php4/pear/scripts/pear-get.in:1.4 --- php4/pear/scripts/pear-get.in:1.3 Sun Jan 6 15:19:41 2002 +++ php4/pear/scripts/pear-get.in Wed Jan 30 07:20:12 2002 @@ -19,313 +19,40 @@ // +----------------------------------------------------------------------+ // - -/* - -command structure: - -* list available packages -* list not-installed packages -* list upgrades -* list packages (by author/category/state) - -* installation commands: -** install latest stable -** install specific release - -* package generation commands: - -*/ - require_once 'PEAR.php'; -require_once 'PEAR/Common.php'; -require_once 'PEAR/Config.php'; require_once 'PEAR/Remote.php'; -require_once 'PEAR/Registry.php'; -require_once 'Console/Getopt.php'; error_reporting(E_ALL & ~E_NOTICE); -$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'; - $pear_user_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.ini'; -} else { - $pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.conf'; - $pear_user_config = getenv('HOME').DIRECTORY_SEPARATOR.'.pearrc'; -} - -$opts = $options[0]; - -foreach ($opts as $opt) { - switch ($opt[0]) { - case 'c': - $pear_user_config = $opt[1]; - break; - case 'C': - $pear_default_config = $opt[1]; - break; - } -} - -$config = new PEAR_Config($pear_user_config, $pear_default_config); -$verbose = 1; - -foreach ($opts as $opt) { - $param = $opt[1]; - switch ($opt[0]) { - case 'd': - list($key, $value) = explode('=', $param); - $config->set($key, $value); - break; - case 'D': - list($key, $value) = explode('=', $param); - $config->set($key, $value, true); - break; - case 'u': - $config->toDefault($param); - break; - case 'v': - $verbose++; - break; - case 'q': - $verbose--; - break; - } -} - -$fallback_config = array( - 'master_server' => 'pear.php.net', - 'php_dir' => PEAR_INSTALL_DIR, - 'ext_dir' => PEAR_EXTENSION_DIR, - 'doc_dir' => '', - 'verbose' => true, +$subcommands = array( + 'help' => 'help [command]', + 'install' => 'install [-r] <package file/name>', + 'upgrade' => 'upgrade [-r] <package file/name>', + 'list' => 'list', + 'info' => 'info <package name>', ); -$fallback_done = array(); - -foreach ($fallback_config as $key => $value) { - if (!$config->isDefined($key)) { - $config->set($key, $value); - $fallback_done[$key] = true; - } -} - -//$verbose = $config->get("verbose"); -$script_dir = $config->get("php_dir"); -$ext_dir = $config->get("ext_dir"); -$doc_dir = $config->get("doc_dir"); -$command = (isset($options[1][1])) ? $options[1][1] : null; -$rest = array_slice($options[1], 2); +$shortcuts = array( + 'list' => 'remote-list', + 'upgrade' => 'install', +); $command_options = array( - "install" => "fr", - "uninstall" => "fr", - "upgrade" => "fr", + 'install' => 'fr', ); -if (isset($command_options[$command])) { - $tmp = Console_Getopt::getopt($rest, $command_options[$command]); - if (PEAR::isError($tmp)) { - usage($tmp); - } - $cmdopts = $tmp[0]; - $cmdargs = $tmp[1]; -} else { - $cmdopts = array(); - $cmdargs = $rest; -} - -// }}} - -switch ($command) { - - // {{{ install, upgrade - - case 'install': case 'upgrade': { - include_once 'PEAR/Installer.php'; - $pkgfile = $cmdargs[0]; - $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); - $installer->setErrorHandling(PEAR_ERROR_DIE, - basename($pkgfile) . ": %s\n"); - $installer->debug = $verbose; - $install_options = array(); - if ($command == 'upgrade') { - $install_options['upgrade'] = true; - } - foreach ($cmdopts as $opt) { - switch ($opt[0]) { - case 'r': - // This option is for use by rpm and other package - // tools that can install files etc. by itself, but - // still needs to register the package as installed in - // PEAR's local registry. - $install_options['register_only'] = true; - break; - case 'f': - $install_options['force'] = true; - break; - } - } - if ($installer->install($pkgfile, $install_options, $config)) { - print "install ok\n"; - } else { - print "install failed\n"; - } - break; - } - - // }}} - // {{{ uninstall - case 'uninstall': { - include_once 'PEAR/Installer.php'; - $pkgfile = $cmdargs[0]; - $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); - $installer->setErrorHandling(PEAR_ERROR_DIE, - basename($pkgfile) . ": %s\n"); - $installer->debug = $verbose; - $uninstall_options = array(); - foreach ($cmdopts as $opt) { - switch ($opt[0]) { - case 'r': - $uninstall_options['register_only'] = true; - break; - case 'f': - $uninstall_options['force'] = true; - break; - } - } - if ($installer->uninstall($pkgfile, $uninstall_options)) { - print "uninstall ok\n"; - } else { - print "uninstall failed\n"; - } - break; - } - // }}} - // {{{ list - - case 'list': { - $remote = new PEAR_Remote($config); - $result = $remote->call('package.listAll'); - $i = $j = 0; - heading("Available packages"); - foreach ($result as $package => $info) { - if ($i++ % 20 == 0) { - if ($j++ > 0) { - print "\n"; - } - printf("%-20s %-10s %-15s %s\n", - "Package", "Stable", "Lead", "Category"); - print str_repeat("-", 75)."\n"; - } - if (empty($info['stable'])) { - $info['stable'] = '(none)'; - } - $stable = (string)$info['stable']; - printf("%-20s %-10s %-15s %s\n", $package, - $info['stable'], $info['lead'], $info['category']); - } - break; - } +include "pearcmd-common.php"; - // }}} - default: { - if (!$store_default_config && !$store_user_config) { - usage(); - } - break; - } -} - -// {{{ usage() - -function usage($error = null) -{ - $stderr = fopen('php://stderr', 'w'); - if (PEAR::isError($error)) { - fputs($stderr, $error->getMessage()); - } elseif ($error !== null) { - fputs($stderr, $error); - } - fputs($stderr, - "Usage: pear-get [options] command [command-options] <parameters>\n". - "Options:\n". - " -v increase verbosity level (default 1)\n". - " -q be quiet, decrease verbosity level\n". - " -c file find user configuration in `file'\n". - " -C file find system configuration in `file'\n". - " -d foo=bar set user config variable `foo' to `bar'\n". - " -D foo=bar set system config variable `foo' to `bar'\n". - " -u foo unset `foo' in the user configuration\n". - " -h, -? display help/usage (this message)\n". - "Commands:\n". - " help [command]\n". - " install [-r] <package file>\n". - " uninstall [-r] <package name>\n". - " list\n". - " info\n". - "\n"); - fclose($stderr); - exit; -} - -// }}} -// {{{ present_array() - -function present_array(&$arr, $keys = null) -{ - if ($keys === null) { - $keys = array_keys($arr); - } - $longest_key = max(array_map("strlen", array_keys($arr))) + 2; - $format_string = "%{$longest_key}s : %s\n"; - foreach ($keys as $k) { - if (is_array($arr[$k])) { - foreach ($arr[$k] as $i => $value) { - $x = "$k #$i"; - $cont = array(); - foreach(array_keys($value) as $val) { - $cont[] = "$val=" . $value[$val]; - } - $v = implode(", ", $cont); - printf($format_string, $x, $v); - } - continue; - } else { - $v = $arr[$k]; - printf($format_string, $k, $v); - } - } +if (isset($shortcuts[$command])) { + $realcommand = $shortcuts[$command]; +} else { + $realcommand = $command; } -// }}} -// {{{ heading() - -function heading($text) -{ - $l = strlen(trim($text)); - print rtrim($text) . "\n" . str_repeat("=", $l) . "\n"; +if (isset($subcommands[$command])) { + include "pearcmd-$realcommand.php"; +} elseif (!$store_default_config && !$store_user_config) { + usage(); } - -// }}} - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ ?> Index: php4/pear/scripts/pear.in diff -u php4/pear/scripts/pear.in:1.28 php4/pear/scripts/pear.in:1.29 --- php4/pear/scripts/pear.in:1.28 Sun Jan 6 15:19:41 2002 +++ php4/pear/scripts/pear.in Wed Jan 30 07:20:12 2002 @@ -19,419 +19,33 @@ // +----------------------------------------------------------------------+ // - -/* - -command structure: - -* remote queries: -** list available packages -** list not-installed packages -** list upgrades - -** list packages (by author/category/state) - -* operations on package files: - -* installation commands: - -* package generation commands: - - - - */ require_once 'PEAR.php'; require_once 'PEAR/Common.php'; -require_once 'PEAR/Config.php'; -require_once 'PEAR/Remote.php'; require_once 'PEAR/Registry.php'; -require_once 'Console/Getopt.php'; error_reporting(E_ALL & ~E_NOTICE); -$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'; - $pear_user_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.ini'; -} else { - $pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.conf'; - $pear_user_config = getenv('HOME').DIRECTORY_SEPARATOR.'.pearrc'; -} - -$opts = $options[0]; - -foreach ($opts as $opt) { - switch ($opt[0]) { - case 'c': - $pear_user_config = $opt[1]; - break; - case 'C': - $pear_default_config = $opt[1]; - break; - } -} - -$config = new PEAR_Config($pear_user_config, $pear_default_config); -$store_user_config = false; -$store_default_config = false; -$verbose = 1; - -foreach ($opts as $opt) { - $param = $opt[1]; - switch ($opt[0]) { - case 'd': - list($key, $value) = explode('=', $param); - $config->set($key, $value); - break; - case 'D': - list($key, $value) = explode('=', $param); - $config->set($key, $value, true); - break; - case 's': - $store_user_config = true; - break; - case 'S': - $store_default_config = true; - break; - case 'u': - $config->toDefault($param); - break; - case 'v': - $verbose++; - break; - case 'q': - $verbose--; - break; - } -} - -if ($store_default_config) { - if (@is_writeable($pear_default_config)) { - $config->writeConfigFile($pear_default_config, 'default'); - } else { - die("You don't have write access to $pear_default_config, exiting!\n"); - } -} - -if ($store_user_config) { - $config->writeConfigFile($pear_user_config, 'userdefined'); -} - -$fallback_config = array( - 'master_server' => 'pear.php.net', - 'php_dir' => PEAR_INSTALL_DIR, - 'ext_dir' => PEAR_EXTENSION_DIR, - 'doc_dir' => PHP_DATADIR . DIRECTORY_SEPARATOR . 'pear' . - DIRECTORY_SEPARATOR . 'doc', - 'verbose' => true, +$subcommands = array( + 'help' => 'help [command]', + 'uninstall' => 'uninstall [-r] <package name>', + 'package' => 'package [package info file]', + 'info' => 'info', + 'list' => 'list', + 'show-config' => 'show-config', ); -$fallback_done = array(); - -foreach ($fallback_config as $key => $value) { - if (!$config->isDefined($key)) { - $config->set($key, $value); - $fallback_done[$key] = true; - } -} - -//$verbose = $config->get("verbose"); -$script_dir = $config->get("php_dir"); -$ext_dir = $config->get("ext_dir"); -$doc_dir = $config->get("doc_dir"); - -$command = (isset($options[1][1])) ? $options[1][1] : null; -$rest = array_slice($options[1], 2); $command_options = array( - "list-installed" => "v", - "install" => "fr", - "uninstall" => "fr", - "upgrade" => "fr", + "list" => "v", + "uninstall" => "fr", ); -if (isset($command_options[$command])) { - $tmp = Console_Getopt::getopt($rest, $command_options[$command]); - if (PEAR::isError($tmp)) { - usage($tmp); - } - $cmdopts = $tmp[0]; - $cmdargs = $tmp[1]; -} else { - $cmdopts = array(); - $cmdargs = $rest; -} - -// }}} - -switch ($command) { - - // {{{ install - - case 'install': case 'upgrade': { - include_once 'PEAR/Installer.php'; - $pkgfile = $cmdargs[0]; - $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); - $installer->setErrorHandling(PEAR_ERROR_DIE, - basename($pkgfile) . ": %s\n"); - $installer->debug = $verbose; - $install_options = array(); - if ($command == 'upgrade') { - $install_options['upgrade'] = true; - } - foreach ($cmdopts as $opt) { - switch ($opt[0]) { - case 'r': - // This option is for use by rpm and other package - // tools that can install files etc. by itself, but - // still needs to register the package as installed in - // PEAR's local registry. - $install_options['register_only'] = true; - break; - case 'f': - $install_options['force'] = true; - break; - } - } - if ($installer->install($pkgfile, $install_options)) { - print "install ok\n"; - } else { - print "install failed\n"; - } - break; - } - - // }}} - // {{{ uninstall - case 'uninstall': { - include_once 'PEAR/Installer.php'; - $pkgfile = $cmdargs[0]; - $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); - $installer->setErrorHandling(PEAR_ERROR_DIE, - basename($pkgfile) . ": %s\n"); - $installer->debug = $verbose; - $uninstall_options = array(); - foreach ($cmdopts as $opt) { - switch ($opt[0]) { - case 'r': - $uninstall_options['register_only'] = true; - break; - case 'f': - $uninstall_options['force'] = true; - break; - } - } - if ($installer->uninstall($pkgfile, $uninstall_options)) { - print "uninstall ok\n"; - } else { - print "uninstall failed\n"; - } - break; - } - // }}} - // {{{ package - - case 'package': { - include_once 'PEAR/Packager.php'; - $pkginfofile = isset($cmdargs[0]) ? $cmdargs[0] : null; - $packager =& new PEAR_Packager($script_dir, $ext_dir, $doc_dir); - $packager->setErrorHandling(PEAR_ERROR_DIE, "pear page: %s\n"); - $packager->debug = $verbose; - if (PEAR::isError($packager->Package($pkginfofile))) { - print "\npackage failed\n"; - } else { - print "package ok\n"; - } - break; - } - - // }}} - // {{{ info - - case 'info': { - $parser = new PEAR_Common; - $parser->setErrorHandling(PEAR_ERROR_DIE, "pear info: %s\n"); - $info = $parser->infoFromTgzFile($cmdargs[0]); - unset($info['filelist']); - present_array($info); - break; - } - - // }}} - // {{{ list-installed - - case 'list-installed': { - $reg = new PEAR_Registry; - $installed = $reg->packageInfo(); - $i = $j = 0; - heading("Installed packages:"); - foreach ($installed as $package) { - if ($i++ % 20 == 0) { - if ($j++ > 0) { - print "\n"; - } - printf("%-20s %-10s %s\n", - "Package", "Version", "State"); - print str_repeat("-", 75)."\n"; - } - printf("%-20s %-10s %s\n", $package['package'], - $package['version'], $package['release_state']); - } - break; - } - - // }}} - // {{{ remote-list - - case 'remote-list': { - $remote = new PEAR_Remote($config); - $result = $remote->call('package.listAll'); - $i = $j = 0; - heading("Available packages"); - foreach ($result as $package => $info) { - if ($i++ % 20 == 0) { - if ($j++ > 0) { - print "\n"; - } - printf("%-20s %-10s %-15s %s\n", - "Package", "Stable", "Lead", "Category"); - print str_repeat("-", 75)."\n"; - } - if (empty($info['stable'])) { - $info['stable'] = '(none)'; - } - $stable = (string)$info['stable']; - printf("%-20s %-10s %-15s %s\n", $package, - $info['stable'], $info['lead'], $info['category']); - } - break; - } - - // }}} - // {{{ show-config - - case 'show-config': { - $keys = $config->getKeys(); - foreach ($keys as $key) { - $value = $config->get($key); - $xi = ""; - if ($config->isDefaulted($key)) { - $xi .= " (default)"; - } - if (isset($fallback_done[$key])) { - $xi .= " (built-in)"; - } - printf("%s = %s%s\n", $key, $value, $xi); - } - break; - } +include "pearcmd-common.php"; - // }}} - // {{{ upload-release - - case 'upload-release': { - if (sizeof($cmdargs) < 1) { - - } - $tarball = $cmdargs[0]; - - } - - // }}} - default: { - if (!$store_default_config && !$store_user_config) { - usage(); - } - break; - } -} - -// {{{ usage() - -function usage($error = null) -{ - $stderr = fopen('php://stderr', 'w'); - if (PEAR::isError($error)) { - fputs($stderr, $error->getMessage()); - } elseif ($error !== null) { - fputs($stderr, $error); - } - fputs($stderr, - "Usage: pear [options] command [command-options] <parameters>\n". - "Options:\n". - " -v increase verbosity level (default 1)\n". - " -q be quiet, decrease verbosity level\n". - " -c file find user configuration in `file'\n". - " -C file find system configuration in `file'\n". - " -d foo=bar set user config variable `foo' to `bar'\n". - " -D foo=bar set system config variable `foo' to `bar'\n". - " -s store user configuration\n". - " -S store system configuration\n". - " -u foo unset `foo' in the user configuration\n". - " -h, -? display help/usage (this message)\n". - "Commands:\n". - " help [command]\n". - " install [-r] <package file>\n". - " uninstall [-r] <package name>\n". - " package [package info file]\n". - " list-installed\n". - " remote-list\n". - " info\n". - " show-config\n". - " upload-release\n". - "\n"); - fclose($stderr); - exit; +if (isset($subcommands[$command])) { + include "pearcmd-$command.php"; +} elseif (!$store_default_config && !$store_user_config) { + usage(); } - -// }}} -// {{{ present_array() - -function present_array(&$arr, $keys = null) -{ - if ($keys === null) { - $keys = array_keys($arr); - } - $longest_key = max(array_map("strlen", array_keys($arr))) + 2; - $format_string = "%{$longest_key}s : %s\n"; - foreach ($keys as $k) { - if (is_array($arr[$k])) { - foreach ($arr[$k] as $i => $value) { - $x = "$k #$i"; - $cont = array(); - foreach(array_keys($value) as $val) { - $cont[] = "$val=" . $value[$val]; - } - $v = implode(", ", $cont); - printf($format_string, $x, $v); - } - continue; - } else { - $v = $arr[$k]; - printf($format_string, $k, $v); - } - } -} - -// }}} -// {{{ heading() - -function heading($text) -{ - $l = strlen(trim($text)); - print rtrim($text) . "\n" . str_repeat("=", $l) . "\n"; -} - -// }}} /* * Local variables: Index: php4/pear/scripts/pearcmd-common.php +++ php4/pear/scripts/pearcmd-common.php <?php require_once "PEAR/Config.php"; require_once "Console/Getopt.php"; $progname = basename($argv[0]); PEAR::setErrorHandling(PEAR_ERROR_PRINT, "$progname: %s\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); } if (OS_WINDOWS) { $pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pearsys.ini'; $pear_user_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.ini'; } else { $pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.conf'; $pear_user_config = getenv('HOME').DIRECTORY_SEPARATOR.'.pearrc'; } $opts = $options[0]; foreach ($opts as $opt) { switch ($opt[0]) { case 'c': $pear_user_config = $opt[1]; break; case 'C': $pear_default_config = $opt[1]; break; } } $config = new PEAR_Config($pear_user_config, $pear_default_config); $store_user_config = false; $store_default_config = false; $verbose = 1; foreach ($opts as $opt) { $param = $opt[1]; switch ($opt[0]) { case 'd': list($key, $value) = explode('=', $param); $config->set($key, $value); break; case 'D': list($key, $value) = explode('=', $param); $config->set($key, $value, true); break; case 's': $store_user_config = true; break; case 'S': $store_default_config = true; break; case 'u': $config->toDefault($param); break; case 'v': $verbose++; break; case 'q': $verbose--; break; } } if ($store_default_config) { if (@is_writeable($pear_default_config)) { $config->writeConfigFile($pear_default_config, 'default'); } else { die("You don't have write access to $pear_default_config, exiting!\n"); } } if ($store_user_config) { $config->writeConfigFile($pear_user_config, 'userdefined'); } $fallback_config = array( 'master_server' => 'pear.php.net', 'php_dir' => PEAR_INSTALL_DIR, 'ext_dir' => PEAR_EXTENSION_DIR, 'doc_dir' => PHP_DATADIR . DIRECTORY_SEPARATOR . 'pear' . DIRECTORY_SEPARATOR . 'doc', 'verbose' => true, ); $fallback_done = array(); foreach ($fallback_config as $key => $value) { if (!$config->isDefined($key)) { $config->set($key, $value); $fallback_done[$key] = true; } } //$verbose = $config->get("verbose"); $script_dir = $config->get("php_dir"); $ext_dir = $config->get("ext_dir"); $doc_dir = $config->get("doc_dir"); $command = (isset($options[1][1])) ? $options[1][1] : null; $rest = array_slice($options[1], 2); if (isset($command_options[$command])) { $tmp = Console_Getopt::getopt($rest, $command_options[$command]); if (PEAR::isError($tmp)) { usage($tmp); } $cmdopts = $tmp[0]; $cmdargs = $tmp[1]; } else { $cmdopts = array(); $cmdargs = $rest; } // {{{ usage() function usage($error = null, $helpsubject = null) { global $progname, $subcommands; $stderr = fopen('php://stderr', 'w'); if (PEAR::isError($error)) { fputs($stderr, $error->getMessage()); } elseif ($error !== null) { fputs($stderr, $error); } fputs($stderr, "Usage: $progname [options] command [command-options] <parameters>\n"); if ($helpsubject == "options") { fputs($stderr, "Options:\n". " -v increase verbosity level (default 1)\n". " -q be quiet, decrease verbosity level\n". " -c file find user configuration in `file'\n". " -C file find system configuration in `file'\n". " -d foo=bar set user config variable `foo' to `bar'\n". " -D foo=bar set system config variable `foo' to `bar'\n". " -s store user configuration\n". " -S store system configuration\n". " -u foo unset `foo' in the user configuration\n". " -h, -? display help/usage (this message)\n"); } else { fputs($stderr, "Type \"$progname help options\" to list all options.\n"); } fputs($stderr, "Commands:".implode("\n ", $subcommands) . "\n"); fclose($stderr); exit; } // }}} // {{{ present_array() function present_array(&$arr, $keys = null) { if ($keys === null) { $keys = array_keys($arr); } $longest_key = max(array_map("strlen", array_keys($arr))) + 2; $format_string = "%{$longest_key}s : %s\n"; foreach ($keys as $k) { if (is_array($arr[$k])) { foreach ($arr[$k] as $i => $value) { $x = "$k #$i"; $cont = array(); foreach(array_keys($value) as $val) { $cont[] = "$val=" . $value[$val]; } $v = implode(", ", $cont); printf($format_string, $x, $v); } continue; } else { $v = $arr[$k]; printf($format_string, $k, $v); } } } // }}} // {{{ heading() function heading($text) { $l = strlen(trim($text)); print rtrim($text) . "\n" . str_repeat("=", $l) . "\n"; } // }}} ?> Index: php4/pear/scripts/pearcmd-help.php +++ php4/pear/scripts/pearcmd-help.php <?php if (isset($cmdargs[0])) { usage(null, $cmdargs[0]); } else { usage(); } ?> Index: php4/pear/scripts/pearcmd-info.php +++ php4/pear/scripts/pearcmd-info.php <?php $parser = new PEAR_Common; $parser->setErrorHandling(PEAR_ERROR_DIE, "pear info: %s\n"); $info = $parser->infoFromTgzFile($cmdargs[0]); unset($info['filelist']); present_array($info); ?> Index: php4/pear/scripts/pearcmd-install.php +++ php4/pear/scripts/pearcmd-install.php <?php include_once 'PEAR/Installer.php'; $pkgfile = $cmdargs[0]; $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); $installer->setErrorHandling(PEAR_ERROR_DIE, basename($pkgfile) . ": %s\n"); $installer->debug = $verbose; $install_options = array(); if ($command == 'upgrade') { $install_options['upgrade'] = true; } foreach ($cmdopts as $opt) { switch ($opt[0]) { case 'r': // This option is for use by rpm and other package // tools that can install files etc. by itself, but // still needs to register the package as installed in // PEAR's local registry. $install_options['register_only'] = true; break; case 'f': $install_options['force'] = true; break; } } if ($installer->install($pkgfile, $install_options, $config)) { print "install ok\n"; } else { print "install failed\n"; } ?> Index: php4/pear/scripts/pearcmd-list.php +++ php4/pear/scripts/pearcmd-list.php <?php $reg = new PEAR_Registry; $installed = $reg->packageInfo(); $i = $j = 0; heading("Installed packages:"); foreach ($installed as $package) { if ($i++ % 20 == 0) { if ($j++ > 0) { print "\n"; } printf("%-20s %-10s %s\n", "Package", "Version", "State"); print str_repeat("-", 75)."\n"; } printf("%-20s %-10s %s\n", $package['package'], $package['version'], $package['release_state']); } ?> Index: php4/pear/scripts/pearcmd-package.php +++ php4/pear/scripts/pearcmd-package.php <?php include_once 'PEAR/Packager.php'; $pkginfofile = isset($cmdargs[0]) ? $cmdargs[0] : null; $packager =& new PEAR_Packager($script_dir, $ext_dir, $doc_dir); $packager->setErrorHandling(PEAR_ERROR_DIE, "pear page: %s\n"); $packager->debug = $verbose; if (PEAR::isError($packager->Package($pkginfofile))) { print "\npackage failed\n"; } else { print "package ok\n"; } ?> Index: php4/pear/scripts/pearcmd-remote-list.php +++ php4/pear/scripts/pearcmd-remote-list.php <?php $remote = new PEAR_Remote($config); $result = $remote->call('package.listAll', 1); $i = $j = 0; heading("Available packages"); foreach ($result as $package => $info) { if ($i++ % 20 == 0) { if ($j++ > 0) { print "\n"; } printf("%-20s %-10s %-15s %s\n", "Package", "Stable", "Lead", "Category"); print str_repeat("-", 75)."\n"; } if (empty($info['stable'])) { $info['stable'] = '(none)'; } $stable = (string)$info['stable']; printf("%-20s %-10s %-15s %s\n", $info['name'], $info['stable'], $info['lead'], $info['category']); } ?> Index: php4/pear/scripts/pearcmd-show-config.php +++ php4/pear/scripts/pearcmd-show-config.php <?php $keys = $config->getKeys(); foreach ($keys as $key) { $value = $config->get($key); $xi = ""; if ($config->isDefaulted($key)) { $xi .= " (default)"; } if (isset($fallback_done[$key])) { $xi .= " (built-in)"; } printf("%s = %s%s\n", $key, $value, $xi); } ?> Index: php4/pear/scripts/pearcmd-uninstall.php +++ php4/pear/scripts/pearcmd-uninstall.php <?php include_once 'PEAR/Installer.php'; $pkgfile = $cmdargs[0]; $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); $installer->setErrorHandling(PEAR_ERROR_DIE, basename($pkgfile) . ": %s\n"); $installer->debug = $verbose; $uninstall_options = array(); foreach ($cmdopts as $opt) { switch ($opt[0]) { case 'r': $uninstall_options['register_only'] = true; break; case 'f': $uninstall_options['force'] = true; break; } } if ($installer->uninstall($pkgfile, $uninstall_options)) { print "uninstall ok\n"; } else { print "uninstall failed\n"; } ?>
Index: php4/pear/Makefile.in diff -u php4/pear/Makefile.in:1.101 php4/pear/Makefile.in:1.102 --- php4/pear/Makefile.in:1.101 Mon Jan 21 13:25:04 2002 +++ php4/pear/Makefile.in Wed Jan 30 07:20:11 2002 @@ -83,6 +83,17 @@ System.php \ XML/Parser.php +PEAR_COMMAND_LIBS=\ + pearcmd-common.php \ + pearcmd-help.php \ + pearcmd-info.php \ + pearcmd-install.php \ + pearcmd-list.php \ + pearcmd-package.php \ + pearcmd-remote-list.php \ + pearcmd-show-config.php \ + pearcmd-uninstall.php + install-data-local: @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ for i in $(PEAR_SUBDIRS); do \ @@ -131,6 +142,10 @@ for prog in phpextdist; do \ echo "Installing program: $$prog"; \ $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ + done; \ + for lib in $(PEAR_COMMAND_LIBS); do \ + echo "Installing program library: $$lib"; \ + $(INSTALL) -m 755 $(srcdir)/scripts/$$lib $(INSTALL_ROOT)$(bindir)/$$lib; \ done HEADER_DIRS = \ Index: php4/pear/scripts/pear-get.in diff -u php4/pear/scripts/pear-get.in:1.3 php4/pear/scripts/pear-get.in:1.4 --- php4/pear/scripts/pear-get.in:1.3 Sun Jan 6 15:19:41 2002 +++ php4/pear/scripts/pear-get.in Wed Jan 30 07:20:12 2002 @@ -19,313 +19,40 @@ // +----------------------------------------------------------------------+ // - -/* - -command structure: - -* list available packages -* list not-installed packages -* list upgrades -* list packages (by author/category/state) - -* installation commands: -** install latest stable -** install specific release - -* package generation commands: - -*/ - require_once 'PEAR.php'; -require_once 'PEAR/Common.php'; -require_once 'PEAR/Config.php'; require_once 'PEAR/Remote.php'; -require_once 'PEAR/Registry.php'; -require_once 'Console/Getopt.php'; error_reporting(E_ALL & ~E_NOTICE); -$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'; - $pear_user_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.ini'; -} else { - $pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.conf'; - $pear_user_config = getenv('HOME').DIRECTORY_SEPARATOR.'.pearrc'; -} - -$opts = $options[0]; - -foreach ($opts as $opt) { - switch ($opt[0]) { - case 'c': - $pear_user_config = $opt[1]; - break; - case 'C': - $pear_default_config = $opt[1]; - break; - } -} - -$config = new PEAR_Config($pear_user_config, $pear_default_config); -$verbose = 1; - -foreach ($opts as $opt) { - $param = $opt[1]; - switch ($opt[0]) { - case 'd': - list($key, $value) = explode('=', $param); - $config->set($key, $value); - break; - case 'D': - list($key, $value) = explode('=', $param); - $config->set($key, $value, true); - break; - case 'u': - $config->toDefault($param); - break; - case 'v': - $verbose++; - break; - case 'q': - $verbose--; - break; - } -} - -$fallback_config = array( - 'master_server' => 'pear.php.net', - 'php_dir' => PEAR_INSTALL_DIR, - 'ext_dir' => PEAR_EXTENSION_DIR, - 'doc_dir' => '', - 'verbose' => true, +$subcommands = array( + 'help' => 'help [command]', + 'install' => 'install [-r] <package file/name>', + 'upgrade' => 'upgrade [-r] <package file/name>', + 'list' => 'list', + 'info' => 'info <package name>', ); -$fallback_done = array(); - -foreach ($fallback_config as $key => $value) { - if (!$config->isDefined($key)) { - $config->set($key, $value); - $fallback_done[$key] = true; - } -} - -//$verbose = $config->get("verbose"); -$script_dir = $config->get("php_dir"); -$ext_dir = $config->get("ext_dir"); -$doc_dir = $config->get("doc_dir"); -$command = (isset($options[1][1])) ? $options[1][1] : null; -$rest = array_slice($options[1], 2); +$shortcuts = array( + 'list' => 'remote-list', + 'upgrade' => 'install', +); $command_options = array( - "install" => "fr", - "uninstall" => "fr", - "upgrade" => "fr", + 'install' => 'fr', ); -if (isset($command_options[$command])) { - $tmp = Console_Getopt::getopt($rest, $command_options[$command]); - if (PEAR::isError($tmp)) { - usage($tmp); - } - $cmdopts = $tmp[0]; - $cmdargs = $tmp[1]; -} else { - $cmdopts = array(); - $cmdargs = $rest; -} - -// }}} - -switch ($command) { - - // {{{ install, upgrade - - case 'install': case 'upgrade': { - include_once 'PEAR/Installer.php'; - $pkgfile = $cmdargs[0]; - $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); - $installer->setErrorHandling(PEAR_ERROR_DIE, - basename($pkgfile) . ": %s\n"); - $installer->debug = $verbose; - $install_options = array(); - if ($command == 'upgrade') { - $install_options['upgrade'] = true; - } - foreach ($cmdopts as $opt) { - switch ($opt[0]) { - case 'r': - // This option is for use by rpm and other package - // tools that can install files etc. by itself, but - // still needs to register the package as installed in - // PEAR's local registry. - $install_options['register_only'] = true; - break; - case 'f': - $install_options['force'] = true; - break; - } - } - if ($installer->install($pkgfile, $install_options, $config)) { - print "install ok\n"; - } else { - print "install failed\n"; - } - break; - } - - // }}} - // {{{ uninstall - case 'uninstall': { - include_once 'PEAR/Installer.php'; - $pkgfile = $cmdargs[0]; - $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); - $installer->setErrorHandling(PEAR_ERROR_DIE, - basename($pkgfile) . ": %s\n"); - $installer->debug = $verbose; - $uninstall_options = array(); - foreach ($cmdopts as $opt) { - switch ($opt[0]) { - case 'r': - $uninstall_options['register_only'] = true; - break; - case 'f': - $uninstall_options['force'] = true; - break; - } - } - if ($installer->uninstall($pkgfile, $uninstall_options)) { - print "uninstall ok\n"; - } else { - print "uninstall failed\n"; - } - break; - } - // }}} - // {{{ list - - case 'list': { - $remote = new PEAR_Remote($config); - $result = $remote->call('package.listAll'); - $i = $j = 0; - heading("Available packages"); - foreach ($result as $package => $info) { - if ($i++ % 20 == 0) { - if ($j++ > 0) { - print "\n"; - } - printf("%-20s %-10s %-15s %s\n", - "Package", "Stable", "Lead", "Category"); - print str_repeat("-", 75)."\n"; - } - if (empty($info['stable'])) { - $info['stable'] = '(none)'; - } - $stable = (string)$info['stable']; - printf("%-20s %-10s %-15s %s\n", $package, - $info['stable'], $info['lead'], $info['category']); - } - break; - } +include "pearcmd-common.php"; - // }}} - default: { - if (!$store_default_config && !$store_user_config) { - usage(); - } - break; - } -} - -// {{{ usage() - -function usage($error = null) -{ - $stderr = fopen('php://stderr', 'w'); - if (PEAR::isError($error)) { - fputs($stderr, $error->getMessage()); - } elseif ($error !== null) { - fputs($stderr, $error); - } - fputs($stderr, - "Usage: pear-get [options] command [command-options] <parameters>\n". - "Options:\n". - " -v increase verbosity level (default 1)\n". - " -q be quiet, decrease verbosity level\n". - " -c file find user configuration in `file'\n". - " -C file find system configuration in `file'\n". - " -d foo=bar set user config variable `foo' to `bar'\n". - " -D foo=bar set system config variable `foo' to `bar'\n". - " -u foo unset `foo' in the user configuration\n". - " -h, -? display help/usage (this message)\n". - "Commands:\n". - " help [command]\n". - " install [-r] <package file>\n". - " uninstall [-r] <package name>\n". - " list\n". - " info\n". - "\n"); - fclose($stderr); - exit; -} - -// }}} -// {{{ present_array() - -function present_array(&$arr, $keys = null) -{ - if ($keys === null) { - $keys = array_keys($arr); - } - $longest_key = max(array_map("strlen", array_keys($arr))) + 2; - $format_string = "%{$longest_key}s : %s\n"; - foreach ($keys as $k) { - if (is_array($arr[$k])) { - foreach ($arr[$k] as $i => $value) { - $x = "$k #$i"; - $cont = array(); - foreach(array_keys($value) as $val) { - $cont[] = "$val=" . $value[$val]; - } - $v = implode(", ", $cont); - printf($format_string, $x, $v); - } - continue; - } else { - $v = $arr[$k]; - printf($format_string, $k, $v); - } - } +if (isset($shortcuts[$command])) { + $realcommand = $shortcuts[$command]; +} else { + $realcommand = $command; } -// }}} -// {{{ heading() - -function heading($text) -{ - $l = strlen(trim($text)); - print rtrim($text) . "\n" . str_repeat("=", $l) . "\n"; +if (isset($subcommands[$command])) { + include "pearcmd-$realcommand.php"; +} elseif (!$store_default_config && !$store_user_config) { + usage(); } - -// }}} - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ ?> Index: php4/pear/scripts/pear.in diff -u php4/pear/scripts/pear.in:1.28 php4/pear/scripts/pear.in:1.29 --- php4/pear/scripts/pear.in:1.28 Sun Jan 6 15:19:41 2002 +++ php4/pear/scripts/pear.in Wed Jan 30 07:20:12 2002 @@ -19,419 +19,33 @@ // +----------------------------------------------------------------------+ // - -/* - -command structure: - -* remote queries: -** list available packages -** list not-installed packages -** list upgrades - -** list packages (by author/category/state) - -* operations on package files: - -* installation commands: - -* package generation commands: - - - - */ require_once 'PEAR.php'; require_once 'PEAR/Common.php'; -require_once 'PEAR/Config.php'; -require_once 'PEAR/Remote.php'; require_once 'PEAR/Registry.php'; -require_once 'Console/Getopt.php'; error_reporting(E_ALL & ~E_NOTICE); -$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'; - $pear_user_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.ini'; -} else { - $pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.conf'; - $pear_user_config = getenv('HOME').DIRECTORY_SEPARATOR.'.pearrc'; -} - -$opts = $options[0]; - -foreach ($opts as $opt) { - switch ($opt[0]) { - case 'c': - $pear_user_config = $opt[1]; - break; - case 'C': - $pear_default_config = $opt[1]; - break; - } -} - -$config = new PEAR_Config($pear_user_config, $pear_default_config); -$store_user_config = false; -$store_default_config = false; -$verbose = 1; - -foreach ($opts as $opt) { - $param = $opt[1]; - switch ($opt[0]) { - case 'd': - list($key, $value) = explode('=', $param); - $config->set($key, $value); - break; - case 'D': - list($key, $value) = explode('=', $param); - $config->set($key, $value, true); - break; - case 's': - $store_user_config = true; - break; - case 'S': - $store_default_config = true; - break; - case 'u': - $config->toDefault($param); - break; - case 'v': - $verbose++; - break; - case 'q': - $verbose--; - break; - } -} - -if ($store_default_config) { - if (@is_writeable($pear_default_config)) { - $config->writeConfigFile($pear_default_config, 'default'); - } else { - die("You don't have write access to $pear_default_config, exiting!\n"); - } -} - -if ($store_user_config) { - $config->writeConfigFile($pear_user_config, 'userdefined'); -} - -$fallback_config = array( - 'master_server' => 'pear.php.net', - 'php_dir' => PEAR_INSTALL_DIR, - 'ext_dir' => PEAR_EXTENSION_DIR, - 'doc_dir' => PHP_DATADIR . DIRECTORY_SEPARATOR . 'pear' . - DIRECTORY_SEPARATOR . 'doc', - 'verbose' => true, +$subcommands = array( + 'help' => 'help [command]', + 'uninstall' => 'uninstall [-r] <package name>', + 'package' => 'package [package info file]', + 'info' => 'info', + 'list' => 'list', + 'show-config' => 'show-config', ); -$fallback_done = array(); - -foreach ($fallback_config as $key => $value) { - if (!$config->isDefined($key)) { - $config->set($key, $value); - $fallback_done[$key] = true; - } -} - -//$verbose = $config->get("verbose"); -$script_dir = $config->get("php_dir"); -$ext_dir = $config->get("ext_dir"); -$doc_dir = $config->get("doc_dir"); - -$command = (isset($options[1][1])) ? $options[1][1] : null; -$rest = array_slice($options[1], 2); $command_options = array( - "list-installed" => "v", - "install" => "fr", - "uninstall" => "fr", - "upgrade" => "fr", + "list" => "v", + "uninstall" => "fr", ); -if (isset($command_options[$command])) { - $tmp = Console_Getopt::getopt($rest, $command_options[$command]); - if (PEAR::isError($tmp)) { - usage($tmp); - } - $cmdopts = $tmp[0]; - $cmdargs = $tmp[1]; -} else { - $cmdopts = array(); - $cmdargs = $rest; -} - -// }}} - -switch ($command) { - - // {{{ install - - case 'install': case 'upgrade': { - include_once 'PEAR/Installer.php'; - $pkgfile = $cmdargs[0]; - $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); - $installer->setErrorHandling(PEAR_ERROR_DIE, - basename($pkgfile) . ": %s\n"); - $installer->debug = $verbose; - $install_options = array(); - if ($command == 'upgrade') { - $install_options['upgrade'] = true; - } - foreach ($cmdopts as $opt) { - switch ($opt[0]) { - case 'r': - // This option is for use by rpm and other package - // tools that can install files etc. by itself, but - // still needs to register the package as installed in - // PEAR's local registry. - $install_options['register_only'] = true; - break; - case 'f': - $install_options['force'] = true; - break; - } - } - if ($installer->install($pkgfile, $install_options)) { - print "install ok\n"; - } else { - print "install failed\n"; - } - break; - } - - // }}} - // {{{ uninstall - case 'uninstall': { - include_once 'PEAR/Installer.php'; - $pkgfile = $cmdargs[0]; - $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); - $installer->setErrorHandling(PEAR_ERROR_DIE, - basename($pkgfile) . ": %s\n"); - $installer->debug = $verbose; - $uninstall_options = array(); - foreach ($cmdopts as $opt) { - switch ($opt[0]) { - case 'r': - $uninstall_options['register_only'] = true; - break; - case 'f': - $uninstall_options['force'] = true; - break; - } - } - if ($installer->uninstall($pkgfile, $uninstall_options)) { - print "uninstall ok\n"; - } else { - print "uninstall failed\n"; - } - break; - } - // }}} - // {{{ package - - case 'package': { - include_once 'PEAR/Packager.php'; - $pkginfofile = isset($cmdargs[0]) ? $cmdargs[0] : null; - $packager =& new PEAR_Packager($script_dir, $ext_dir, $doc_dir); - $packager->setErrorHandling(PEAR_ERROR_DIE, "pear page: %s\n"); - $packager->debug = $verbose; - if (PEAR::isError($packager->Package($pkginfofile))) { - print "\npackage failed\n"; - } else { - print "package ok\n"; - } - break; - } - - // }}} - // {{{ info - - case 'info': { - $parser = new PEAR_Common; - $parser->setErrorHandling(PEAR_ERROR_DIE, "pear info: %s\n"); - $info = $parser->infoFromTgzFile($cmdargs[0]); - unset($info['filelist']); - present_array($info); - break; - } - - // }}} - // {{{ list-installed - - case 'list-installed': { - $reg = new PEAR_Registry; - $installed = $reg->packageInfo(); - $i = $j = 0; - heading("Installed packages:"); - foreach ($installed as $package) { - if ($i++ % 20 == 0) { - if ($j++ > 0) { - print "\n"; - } - printf("%-20s %-10s %s\n", - "Package", "Version", "State"); - print str_repeat("-", 75)."\n"; - } - printf("%-20s %-10s %s\n", $package['package'], - $package['version'], $package['release_state']); - } - break; - } - - // }}} - // {{{ remote-list - - case 'remote-list': { - $remote = new PEAR_Remote($config); - $result = $remote->call('package.listAll'); - $i = $j = 0; - heading("Available packages"); - foreach ($result as $package => $info) { - if ($i++ % 20 == 0) { - if ($j++ > 0) { - print "\n"; - } - printf("%-20s %-10s %-15s %s\n", - "Package", "Stable", "Lead", "Category"); - print str_repeat("-", 75)."\n"; - } - if (empty($info['stable'])) { - $info['stable'] = '(none)'; - } - $stable = (string)$info['stable']; - printf("%-20s %-10s %-15s %s\n", $package, - $info['stable'], $info['lead'], $info['category']); - } - break; - } - - // }}} - // {{{ show-config - - case 'show-config': { - $keys = $config->getKeys(); - foreach ($keys as $key) { - $value = $config->get($key); - $xi = ""; - if ($config->isDefaulted($key)) { - $xi .= " (default)"; - } - if (isset($fallback_done[$key])) { - $xi .= " (built-in)"; - } - printf("%s = %s%s\n", $key, $value, $xi); - } - break; - } +include "pearcmd-common.php"; - // }}} - // {{{ upload-release - - case 'upload-release': { - if (sizeof($cmdargs) < 1) { - - } - $tarball = $cmdargs[0]; - - } - - // }}} - default: { - if (!$store_default_config && !$store_user_config) { - usage(); - } - break; - } -} - -// {{{ usage() - -function usage($error = null) -{ - $stderr = fopen('php://stderr', 'w'); - if (PEAR::isError($error)) { - fputs($stderr, $error->getMessage()); - } elseif ($error !== null) { - fputs($stderr, $error); - } - fputs($stderr, - "Usage: pear [options] command [command-options] <parameters>\n". - "Options:\n". - " -v increase verbosity level (default 1)\n". - " -q be quiet, decrease verbosity level\n". - " -c file find user configuration in `file'\n". - " -C file find system configuration in `file'\n". - " -d foo=bar set user config variable `foo' to `bar'\n". - " -D foo=bar set system config variable `foo' to `bar'\n". - " -s store user configuration\n". - " -S store system configuration\n". - " -u foo unset `foo' in the user configuration\n". - " -h, -? display help/usage (this message)\n". - "Commands:\n". - " help [command]\n". - " install [-r] <package file>\n". - " uninstall [-r] <package name>\n". - " package [package info file]\n". - " list-installed\n". - " remote-list\n". - " info\n". - " show-config\n". - " upload-release\n". - "\n"); - fclose($stderr); - exit; +if (isset($subcommands[$command])) { + include "pearcmd-$command.php"; +} elseif (!$store_default_config && !$store_user_config) { + usage(); } - -// }}} -// {{{ present_array() - -function present_array(&$arr, $keys = null) -{ - if ($keys === null) { - $keys = array_keys($arr); - } - $longest_key = max(array_map("strlen", array_keys($arr))) + 2; - $format_string = "%{$longest_key}s : %s\n"; - foreach ($keys as $k) { - if (is_array($arr[$k])) { - foreach ($arr[$k] as $i => $value) { - $x = "$k #$i"; - $cont = array(); - foreach(array_keys($value) as $val) { - $cont[] = "$val=" . $value[$val]; - } - $v = implode(", ", $cont); - printf($format_string, $x, $v); - } - continue; - } else { - $v = $arr[$k]; - printf($format_string, $k, $v); - } - } -} - -// }}} -// {{{ heading() - -function heading($text) -{ - $l = strlen(trim($text)); - print rtrim($text) . "\n" . str_repeat("=", $l) . "\n"; -} - -// }}} /* * Local variables: Index: php4/pear/scripts/pearcmd-common.php +++ php4/pear/scripts/pearcmd-common.php <?php require_once "PEAR/Config.php"; require_once "Console/Getopt.php"; $progname = basename($argv[0]); PEAR::setErrorHandling(PEAR_ERROR_PRINT, "$progname: %s\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); } if (OS_WINDOWS) { $pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pearsys.ini'; $pear_user_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.ini'; } else { $pear_default_config = PHP_SYSCONFDIR.DIRECTORY_SEPARATOR.'pear.conf'; $pear_user_config = getenv('HOME').DIRECTORY_SEPARATOR.'.pearrc'; } $opts = $options[0]; foreach ($opts as $opt) { switch ($opt[0]) { case 'c': $pear_user_config = $opt[1]; break; case 'C': $pear_default_config = $opt[1]; break; } } $config = new PEAR_Config($pear_user_config, $pear_default_config); $store_user_config = false; $store_default_config = false; $verbose = 1; foreach ($opts as $opt) { $param = $opt[1]; switch ($opt[0]) { case 'd': list($key, $value) = explode('=', $param); $config->set($key, $value); break; case 'D': list($key, $value) = explode('=', $param); $config->set($key, $value, true); break; case 's': $store_user_config = true; break; case 'S': $store_default_config = true; break; case 'u': $config->toDefault($param); break; case 'v': $verbose++; break; case 'q': $verbose--; break; } } if ($store_default_config) { if (@is_writeable($pear_default_config)) { $config->writeConfigFile($pear_default_config, 'default'); } else { die("You don't have write access to $pear_default_config, exiting!\n"); } } if ($store_user_config) { $config->writeConfigFile($pear_user_config, 'userdefined'); } $fallback_config = array( 'master_server' => 'pear.php.net', 'php_dir' => PEAR_INSTALL_DIR, 'ext_dir' => PEAR_EXTENSION_DIR, 'doc_dir' => PHP_DATADIR . DIRECTORY_SEPARATOR . 'pear' . DIRECTORY_SEPARATOR . 'doc', 'verbose' => true, ); $fallback_done = array(); foreach ($fallback_config as $key => $value) { if (!$config->isDefined($key)) { $config->set($key, $value); $fallback_done[$key] = true; } } //$verbose = $config->get("verbose"); $script_dir = $config->get("php_dir"); $ext_dir = $config->get("ext_dir"); $doc_dir = $config->get("doc_dir"); $command = (isset($options[1][1])) ? $options[1][1] : null; $rest = array_slice($options[1], 2); if (isset($command_options[$command])) { $tmp = Console_Getopt::getopt($rest, $command_options[$command]); if (PEAR::isError($tmp)) { usage($tmp); } $cmdopts = $tmp[0]; $cmdargs = $tmp[1]; } else { $cmdopts = array(); $cmdargs = $rest; } // {{{ usage() function usage($error = null, $helpsubject = null) { global $progname, $subcommands; $stderr = fopen('php://stderr', 'w'); if (PEAR::isError($error)) { fputs($stderr, $error->getMessage()); } elseif ($error !== null) { fputs($stderr, $error); } fputs($stderr, "Usage: $progname [options] command [command-options] <parameters>\n"); if ($helpsubject == "options") { fputs($stderr, "Options:\n". " -v increase verbosity level (default 1)\n". " -q be quiet, decrease verbosity level\n". " -c file find user configuration in `file'\n". " -C file find system configuration in `file'\n". " -d foo=bar set user config variable `foo' to `bar'\n". " -D foo=bar set system config variable `foo' to `bar'\n". " -s store user configuration\n". " -S store system configuration\n". " -u foo unset `foo' in the user configuration\n". " -h, -? display help/usage (this message)\n"); } else { fputs($stderr, "Type \"$progname help options\" to list all options.\n"); } fputs($stderr, "Commands:".implode("\n ", $subcommands) . "\n"); fclose($stderr); exit; } // }}} // {{{ present_array() function present_array(&$arr, $keys = null) { if ($keys === null) { $keys = array_keys($arr); } $longest_key = max(array_map("strlen", array_keys($arr))) + 2; $format_string = "%{$longest_key}s : %s\n"; foreach ($keys as $k) { if (is_array($arr[$k])) { foreach ($arr[$k] as $i => $value) { $x = "$k #$i"; $cont = array(); foreach(array_keys($value) as $val) { $cont[] = "$val=" . $value[$val]; } $v = implode(", ", $cont); printf($format_string, $x, $v); } continue; } else { $v = $arr[$k]; printf($format_string, $k, $v); } } } // }}} // {{{ heading() function heading($text) { $l = strlen(trim($text)); print rtrim($text) . "\n" . str_repeat("=", $l) . "\n"; } // }}} ?> Index: php4/pear/scripts/pearcmd-help.php +++ php4/pear/scripts/pearcmd-help.php <?php if (isset($cmdargs[0])) { usage(null, $cmdargs[0]); } else { usage(); } ?> Index: php4/pear/scripts/pearcmd-info.php +++ php4/pear/scripts/pearcmd-info.php <?php $parser = new PEAR_Common; $parser->setErrorHandling(PEAR_ERROR_DIE, "pear info: %s\n"); $info = $parser->infoFromTgzFile($cmdargs[0]); unset($info['filelist']); present_array($info); ?> Index: php4/pear/scripts/pearcmd-install.php +++ php4/pear/scripts/pearcmd-install.php <?php include_once 'PEAR/Installer.php'; $pkgfile = $cmdargs[0]; $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); $installer->setErrorHandling(PEAR_ERROR_DIE, basename($pkgfile) . ": %s\n"); $installer->debug = $verbose; $install_options = array(); if ($command == 'upgrade') { $install_options['upgrade'] = true; } foreach ($cmdopts as $opt) { switch ($opt[0]) { case 'r': // This option is for use by rpm and other package // tools that can install files etc. by itself, but // still needs to register the package as installed in // PEAR's local registry. $install_options['register_only'] = true; break; case 'f': $install_options['force'] = true; break; } } if ($installer->install($pkgfile, $install_options, $config)) { print "install ok\n"; } else { print "install failed\n"; } ?> Index: php4/pear/scripts/pearcmd-list.php +++ php4/pear/scripts/pearcmd-list.php <?php $reg = new PEAR_Registry; $installed = $reg->packageInfo(); $i = $j = 0; heading("Installed packages:"); foreach ($installed as $package) { if ($i++ % 20 == 0) { if ($j++ > 0) { print "\n"; } printf("%-20s %-10s %s\n", "Package", "Version", "State"); print str_repeat("-", 75)."\n"; } printf("%-20s %-10s %s\n", $package['package'], $package['version'], $package['release_state']); } ?> Index: php4/pear/scripts/pearcmd-package.php +++ php4/pear/scripts/pearcmd-package.php <?php include_once 'PEAR/Packager.php'; $pkginfofile = isset($cmdargs[0]) ? $cmdargs[0] : null; $packager =& new PEAR_Packager($script_dir, $ext_dir, $doc_dir); $packager->setErrorHandling(PEAR_ERROR_DIE, "pear page: %s\n"); $packager->debug = $verbose; if (PEAR::isError($packager->Package($pkginfofile))) { print "\npackage failed\n"; } else { print "package ok\n"; } ?> Index: php4/pear/scripts/pearcmd-remote-list.php +++ php4/pear/scripts/pearcmd-remote-list.php <?php $remote = new PEAR_Remote($config); $result = $remote->call('package.listAll', 1); $i = $j = 0; heading("Available packages"); foreach ($result as $package => $info) { if ($i++ % 20 == 0) { if ($j++ > 0) { print "\n"; } printf("%-20s %-10s %-15s %s\n", "Package", "Stable", "Lead", "Category"); print str_repeat("-", 75)."\n"; } if (empty($info['stable'])) { $info['stable'] = '(none)'; } $stable = (string)$info['stable']; printf("%-20s %-10s %-15s %s\n", $info['name'], $info['stable'], $info['lead'], $info['category']); } ?> Index: php4/pear/scripts/pearcmd-show-config.php +++ php4/pear/scripts/pearcmd-show-config.php <?php $keys = $config->getKeys(); foreach ($keys as $key) { $value = $config->get($key); $xi = ""; if ($config->isDefaulted($key)) { $xi .= " (default)"; } if (isset($fallback_done[$key])) { $xi .= " (built-in)"; } printf("%s = %s%s\n", $key, $value, $xi); } ?> Index: php4/pear/scripts/pearcmd-uninstall.php +++ php4/pear/scripts/pearcmd-uninstall.php <?php include_once 'PEAR/Installer.php'; $pkgfile = $cmdargs[0]; $installer =& new PEAR_Installer($script_dir, $ext_dir, $doc_dir); $installer->setErrorHandling(PEAR_ERROR_DIE, basename($pkgfile) . ": %s\n"); $installer->debug = $verbose; $uninstall_options = array(); foreach ($cmdopts as $opt) { switch ($opt[0]) { case 'r': $uninstall_options['register_only'] = true; break; case 'f': $uninstall_options['force'] = true; break; } } if ($installer->uninstall($pkgfile, $uninstall_options)) { print "uninstall ok\n"; } else { print "uninstall failed\n"; } ?>