[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-67-g650bec1

Ian Beckwith ianb at erislabs.net
Tue Feb 2 20:49:57 UTC 2010 

The following commit has been merged in the master branch:
commit 650bec165883451a2377ac6ee4bae2c0e68098f5
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Tue Feb 2 20:46:04 2010 +0000

    New elvi: bing, thanks to tczy.

diff --git a/ChangeLog b/ChangeLog
index d263f45..47c34f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02  Ian Beckwith  <ianb at erislabs.net>
+
+	* New elvi: bing, thanks to tczy.
+	  Elvi number One Hundred!!!1!
+
 2010-01-26  James Rowe  <jnrowe at gmail.com>
 
 	* elvi/bbcnews: Fixes for upstreams search changes. Based on a patch by
diff --git a/Makefile.in b/Makefile.in
index 11adfa4..ffa75fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -383,7 +383,7 @@ uninstall-man1:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -408,7 +408,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -585,7 +585,8 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -629,17 +630,17 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
diff --git a/README b/README
index a008d28..2b98855 100644
--- a/README
+++ b/README
@@ -160,6 +160,7 @@ arxiv           -- Search arXiv E-Print Archive for articles
 ask             -- Question the web using Ask Jeeves (www.ask.com)
 aur             -- Search aur.archlinux.org for PKGBUILDS
 austlii         -- Search Australian Law docs (www.austlii.edu.au)
+bing            -- Search the web using Microsoft's Bing (www.bing.com)
 bbcnews         -- Search BBC News (news.bbc.co.uk)
 cddb            -- Search for cd track listings in CDDB (www.gracenote.com)
 cia             -- Search CIA documents at www.cia.gov
diff --git a/aclocal.m4 b/aclocal.m4
index 501584d..0dd43aa 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/configure b/configure
index a5e86ed..0e7b11b 100755
--- a/configure
+++ b/configure
@@ -1,10 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for surfraw 2.2.6.
+# Generated by GNU Autoconf 2.65 for surfraw 2.2.6.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -523,7 +525,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -1325,7 +1328,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 surfraw configure 2.2.6
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1342,7 +1345,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by surfraw $as_me 2.2.6, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1595,7 +1598,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -1604,9 +1607,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2028,6 +2031,7 @@ IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2035,7 +2039,6 @@ fi
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -2944,7 +2947,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by surfraw $as_me 2.2.6, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2979,6 +2982,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -2993,10 +2997,11 @@ Report bugs to the package provider."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 surfraw config.status 2.2.6
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -3034,6 +3039,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -3206,7 +3213,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -3220,7 +3227,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index 756d115..c18eb27 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -12,6 +12,7 @@ dist_elvi_SCRIPTS	= \
 		  ask \
 		  aur \
 		  austlii \
+		  bing \
 		  bbcnews \
 		  cddb \
 		  cia \
diff --git a/elvi/Makefile.in b/elvi/Makefile.in
index efd05a4..a6c6d7e 100644
--- a/elvi/Makefile.in
+++ b/elvi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44,7 +44,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__dist_elvi_SCRIPTS_DIST = W acronym alioth altavista amazon archpkg \
-	arxiv ask aur austlii bbcnews cddb cia cite cliki cnn \
+	arxiv ask aur austlii bing bbcnews cddb cia cite cliki cnn \
 	codesearch comlaw ctan currency cve debbugs debcontents \
 	deblists deblogs debpackages debpkghome debpts debsec \
 	debvcsbrowse debwiki deja discogs dmoz ebay etym excite fast \
@@ -163,18 +163,18 @@ top_srcdir = @top_srcdir@
 # $Id$
 elvidir = $(ELVIDIR)
 dist_elvi_SCRIPTS = W acronym alioth altavista amazon archpkg arxiv \
-	ask aur austlii bbcnews cddb cia cite cliki cnn codesearch \
-	comlaw ctan currency cve debbugs debcontents deblists deblogs \
-	debpackages debpkghome debpts debsec debvcsbrowse debwiki deja \
-	discogs dmoz ebay etym excite fast foldoc filesearching \
-	finkpkg freebsd freedb freshmeat fsfdir gcache genbugs genpkg \
-	genportage gutenberg google happypenguin imdb ixquick javasun \
-	scpan slinuxdoc l1sp lastfm leodict lsm macports mathworld \
-	mininova musicbrainz netbsd ntrs openbsd piratebay pgpkeys \
-	port pubmed rae rfc rhyme rpmsearch scholar scicom slashdot \
-	sourceforge springer stockquote sunonesearch thesaurus \
-	translate urban w3css w3html w3link w3rdf wayback webster \
-	wetandwild wikipedia woffle yahoo youtube yubnub \
+	ask aur austlii bing bbcnews cddb cia cite cliki cnn \
+	codesearch comlaw ctan currency cve debbugs debcontents \
+	deblists deblogs debpackages debpkghome debpts debsec \
+	debvcsbrowse debwiki deja discogs dmoz ebay etym excite fast \
+	foldoc filesearching finkpkg freebsd freedb freshmeat fsfdir \
+	gcache genbugs genpkg genportage gutenberg google happypenguin \
+	imdb ixquick javasun scpan slinuxdoc l1sp lastfm leodict lsm \
+	macports mathworld mininova musicbrainz netbsd ntrs openbsd \
+	piratebay pgpkeys port pubmed rae rfc rhyme rpmsearch scholar \
+	scicom slashdot sourceforge springer stockquote sunonesearch \
+	thesaurus translate urban w3css w3html w3link w3rdf wayback \
+	webster wetandwild wikipedia woffle yahoo youtube yubnub \
 	$(am__append_1)
 all: all-am
 
diff --git a/elvi/bing b/elvi/bing
new file mode 100644
index 0000000..206ee6c
--- /dev/null
+++ b/elvi/bing
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# AUTHOR: tczy, based on piratebay by J.R. Mauro
+#
+# DATE: Mon, 18 Jan 2010 13:37:00 +0100
+#
+# DESC: Elvi to search the web using Microsoft's Bing
+# elvis: bing		-- Search the web using Microsoft's Bing (www.bing.com)
+. surfraw || exit 1
+
+w3_usage_hook () {
+    cat <<EOF
+Usage: $w3_argv0 [options] [search words]...
+Description:
+  Search the web using Microsoft's Bing (www.bing.com)
+EOF
+    w3_global_usage
+}
+
+w3_config
+w3_parse_args "$@"
+# w3_args now contains a list of arguments
+if test -z "$w3_args"; then
+    w3_browse_url "http://www.bing.com/"
+else
+    escaped_args=`w3_url_of_arg $w3_args`
+    w3_browse_url "http://www.bing.com/search?q=${escaped_args}&go=&form=QBLH&filt=all"
+fi
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 25fb834..7d8cf53 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/links.IN b/links.IN
index 94386c0..4b039ff 100644
--- a/links.IN
+++ b/links.IN
@@ -8,6 +8,7 @@ elvi.1sr.gz @mandir@/man1/arxiv.1sr.gz
 elvi.1sr.gz @mandir@/man1/ask.1sr.gz
 elvi.1sr.gz @mandir@/man1/aur.1sr.gz
 elvi.1sr.gz @mandir@/man1/austlii.1sr.gz
+elvi.1sr.gz @mandir@/man1/bing.1sr.gz
 elvi.1sr.gz @mandir@/man1/bbcnews.1sr.gz
 elvi.1sr.gz @mandir@/man1/cddb.1sr.gz
 elvi.1sr.gz @mandir@/man1/cite.1sr.gz
diff --git a/test/Makefile.in b/test/Makefile.in
index 8b0e5de..d20fa04 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/test/bing.test b/test/bing.test
new file mode 100644
index 0000000..019eebd
--- /dev/null
+++ b/test/bing.test
@@ -0,0 +1,2 @@
+sr bing surfraw
+a fast unix command line

-- 
surfraw -  a fast unix command line interface to WWW

More information about the Surfraw-commits mailing list