diff options
| author | Stig Bakken <ssb@php.net> | 2002-07-07 21:01:10 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 2002-07-07 21:01:10 +0000 |
| commit | 6e0745b57adcf44e455cf4a21754471c11484ba1 (patch) | |
| tree | a645edbd71a4ecd874872367847ef256879e8efd /pear | |
| parent | 81e5b17f9171dc1431993b4326424f3435bf09d7 (diff) | |
| download | php-git-6e0745b57adcf44e455cf4a21754471c11484ba1.tar.gz | |
* don't set include path if running 'pear.in' without substitutions
made by the installer
* sort command names in help output
Diffstat (limited to 'pear')
| -rw-r--r-- | pear/scripts/pear.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pear/scripts/pear.in b/pear/scripts/pear.in index d075a8d449..6e0fa3ef29 100644 --- a/pear/scripts/pear.in +++ b/pear/scripts/pear.in @@ -24,7 +24,9 @@ /** * @nodep Gtk */ -ini_set('include_path', '@include_path@'); +if ('@include_path@' != '@'.'include_path'.'@') { + ini_set('include_path', '@include_path@'); +} ini_set('allow_url_fopen', true); set_time_limit(0); ob_implicit_flush(true); @@ -203,6 +205,7 @@ function usage($error = null, $helpsubject = null) "Commands:\n"; $maxlen = max(array_map("strlen", $all_commands)); $formatstr = "%-{$maxlen}s %s\n"; + ksort($all_commands); foreach ($all_commands as $cmd => $class) { $put .= sprintf($formatstr, $cmd, PEAR_Command::getDescription($cmd)); } |