diff options
| author | Greg Beaver <cellog@php.net> | 2008-05-30 23:42:50 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2008-05-30 23:42:50 +0000 |
| commit | 3f0952cdf7f7f61fdc82f391d54552634ec734f8 (patch) | |
| tree | d3e16a4b2dcbefaf91a5cd82a1816062de8e14a4 /pear | |
| parent | 83e491b2c3b1527a2989fb46d7af8531240666a2 (diff) | |
| download | php-git-3f0952cdf7f7f61fdc82f391d54552634ec734f8.tar.gz | |
patch by Christopher Jones: use wget/fetch by default if available, correct typo/Errrrrorr in fetch.php
Diffstat (limited to 'pear')
| -rw-r--r-- | pear/Makefile.frag | 11 | ||||
| -rw-r--r-- | pear/fetch.php | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pear/Makefile.frag b/pear/Makefile.frag index a028ba39b7..e036dcbaad 100644 --- 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 a169c4443e..c3fd44df40 100644 --- 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); |