From 4ac778c4d9cca6dc00bcb05efe067006ca803cd3 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 29 Oct 2013 09:29:51 +0000 Subject: [PATCH] show channel and add command how to discover channel to help message --- setup/check_install.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup/check_install.php b/setup/check_install.php index 26e8df99b7..51fa7c933c 100644 --- a/setup/check_install.php +++ b/setup/check_install.php @@ -416,7 +416,7 @@ function pear_check($package,$args) // is the right version availible $available = (@$available || $pear_available && !$package) && (!$min_version || version_compare($min_version,$version_available) <= 0); echo '
'.($available ? $passed_icon : $warning_icon).' '. - lang('Checking PEAR%1 is installed',($package?'::'.$package:'').($min_version?" ($min_version)":'')).': '. + lang('Checking PEAR%1 is installed',($package?($channel?' '.$channel.'/':'::').$package:'').($min_version?" ($min_version)":'')).': '. ($available ? ($version_available ? $version_available : lang('True')) : lang('False'))."
\n"; if (!$available) // give further info only if not availible @@ -440,7 +440,9 @@ function pear_check($package,$args) } elseif ($package) { - echo ' '.lang('You can install it by running:').' pear install '.$package; + echo ' '.lang('You can install it by running:'). + ($channel ? ' pear channel-discover '.$channel.' ;' : ''). + ' pear install '.$package; } echo ""; }