[PHP-DEV] pear proxy install patch

[Christopher Jones]

Hannes (or anyone),

Can you apply these patches for pear?  I've reverted to use wget
by default.  The newish fetch.php is used as a last resort.

I fixed one real message typo in fetch.php, and changed the humourous
error message prefix to something easier to grep, i.e. "Error".

Chris

--
Christopher Jones, Oracle
Email: [EMAIL PROTECTED]    Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/   Free PHP Book: http://tinyurl.com/f8jad

Index: Makefile.frag
===================================================================
RCS file: /repository/php-src/pear/Attic/Makefile.frag,v
retrieving revision 1.35.6.10.2.2.2.2
diff -u -a -r1.35.6.10.2.2.2.2 Makefile.frag
--- Makefile.frag	19 May 2008 15:20:55 -0000	1.35.6.10.2.2.2.2
+++ Makefile.frag	30 May 2008 22:39:41 -0000
@@ -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 \

Index: fetch.php
===================================================================
RCS file: /repository/php-src/pear/Attic/fetch.php,v
retrieving revision 1.1.2.1
diff -u -a -r1.1.2.1 fetch.php
--- fetch.php	14 Apr 2008 16:56:50 -0000	1.1.2.1
+++ fetch.php	30 May 2008 22:39:56 -0000
@@ -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 Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php