[PHP-CVS] cvs: php-src(PHP_5_3) /pear Makefile.frag fetch.php

[Greg Beaver]

cellog          Fri May 30 23:42:50 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/pear       Makefile.frag fetch.php 
  Log:
  patch by Christopher Jones: use wget/fetch by default if available, correct 
typo/Errrrrorr in fetch.php
  
http://cvs.php.net/viewvc.cgi/php-src/pear/Makefile.frag?r1=1.35.6.10.2.2.2.2&r2=1.35.6.10.2.2.2.3&diff_format=u
Index: php-src/pear/Makefile.frag
diff -u php-src/pear/Makefile.frag:1.35.6.10.2.2.2.2 
php-src/pear/Makefile.frag:1.35.6.10.2.2.2.3
--- php-src/pear/Makefile.frag:1.35.6.10.2.2.2.2        Mon May 19 15:20:55 2008
+++ php-src/pear/Makefile.frag  Fri May 30 23:42:50 2008
@@ -5,6 +5,9 @@
 # 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 @@
                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 \
http://cvs.php.net/viewvc.cgi/php-src/pear/fetch.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/pear/fetch.php
diff -u php-src/pear/fetch.php:1.1.2.1 php-src/pear/fetch.php:1.1.2.2
--- php-src/pear/fetch.php:1.1.2.1      Mon Apr 14 16:56:50 2008
+++ php-src/pear/fetch.php      Fri May 30 23:42:50 2008
@@ -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 @@
         break;
 
     case STREAM_NOTIFY_CONNECT:
-        echo "Conntected...\n";
+        echo "Connected...\n";
         break;
 
     case STREAM_NOTIFY_FILE_SIZE_IS:
@@ -58,7 +59,7 @@
 }
 
 $err = error_get_last();
-echo "\nErrrrrorr..\n", $err["message"], "\n";
+echo "\nError..\n", $err["message"], "\n";
 exit(1);
 
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php