patch by Christopher Jones: use wget/fetch by default if available, correct typo...

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index a028ba39b724a3ab188ecd0607c2d553d066cfee..e036dcbaad776a75ab92a8f07f59e8a464c39e91 100644 (file)
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -5,6 +5,9 @@ peardir=$(PEAR_INSTALLDIR)
 # Skip all php.ini files altogether
 PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
 
+WGET = `which wget 2>/dev/null`
+FETCH = `which fetch 2>/dev/null`
+
 install-pear-installer: $(SAPI_CLI_PATH)
        @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
 
@@ -14,7 +17,13 @@ install-pear:
                if test -f $(srcdir)/install-pear-nozlib.phar; then \
                        cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
                else \
-                       $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
+                       if test ! -z "$(WGET)" && test -x "$(WGET)"; then \
+                               "$(WGET)" http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir)/; \
+                       elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+                               "$(FETCH)" -o $(builddir)/ http://pear.php.net/install-pear-nozlib.phar; \
+                       else \
+                               $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
+                       fi \
                fi \
        fi
        @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \

diff --git a/pear/fetch.php b/pear/fetch.php
index a169c4443e3f79ef8b7b9ee0ab116d5ff1b27ef2..c3fd44df40648ff8ac02fba03cee0bd1a3c24ce8 100644 (file)
--- a/pear/fetch.php
+++ b/pear/fetch.php
@@ -1,4 +1,5 @@
 <?php
+
 function usage($argv) {
     echo "Usage:\n";
     printf("\tphp %s <http://example.com/file> <localfile>\n", $argv[0]);
@@ -22,7 +23,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
         break;
 
     case STREAM_NOTIFY_CONNECT:
-        echo "Conntected...\n";
+        echo "Connected...\n";
         break;
 
     case STREAM_NOTIFY_FILE_SIZE_IS:
@@ -58,7 +59,7 @@ if (is_resource($fp) && file_put_contents($argv[2], $fp)) {
 }
 
 $err = error_get_last();
-echo "\nErrrrrorr..\n", $err["message"], "\n";
+echo "\nError..\n", $err["message"], "\n";
 exit(1);