From: Stig Bakken <ssb@php.net>
Date: Sun, 7 Jul 2002 21:01:10 +0000 (+0000)
Subject: * don't set include path if running 'pear.in' without substitutions
X-Git-Tag: INITIAL_IMPORT_SOURCEFORGE~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e0745b57adcf44e455cf4a21754471c11484ba1;p=php

* don't set include path if running 'pear.in' without substitutions
  made by the installer
* sort command names in help output
---

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));
         }