* 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 d075a8d44946bd8bbce9a8e6a4f83c8b05e18780..6e0fa3ef29c22e83668b3428def03a543cd8fe4a 100644 (file)
--- 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));
         }