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

Ian Beckwith ianb at erislabs.net
Mon Oct 25 04:07:21 UTC 2010


The following commit has been merged in the master branch:
commit 9aa48172dcb549f29352698d58fc8e818cfffc7f
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Mon Oct 25 05:06:59 2010 +0100

    updated build system for added/removed elvi; named yandex test file correctly

diff --git a/Makefile.am b/Makefile.am
index ea6ba21..49dacb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
 SUBDIRS		= elvi test examples
 
 bin_SCRIPTS = surfraw surfraw-update-path
diff --git a/README b/README
index 5770038..486a38d 100644
--- a/README
+++ b/README
@@ -154,111 +154,112 @@ Options
 
   $ surfraw -elvi
  GLOBAL ELVI:
-acronym         -- Look for acronyms definitions (www.acronymfinder.com)
-ads             -- Search SAO/NASA Astrophysics Data System
-alioth          -- Search Alioth (alioth.debian.org)
-altavista       -- Search the web using Altavista (www.altavista.com)
-amazon          -- Search the amazon.com bookstore
-archpkg         -- Search Arch Linux packages (www.archlinux.org)
-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)
-bbcnews         -- Search BBC News (news.bbc.co.uk)
-bing            -- Search the web using Microsoft's Bing (www.bing.com)
-bookfinder      -- Search for books using www.bookfinder.com
-bugmenot        -- Bypass compulsory web registration with bugmenot.com
-cddb            -- Search for cd track listings in CDDB (www.gracenote.com)
-cia             -- Search CIA documents at www.cia.gov
-cite            -- Search computer science papers (citeseerx.ist.psu.edu)
-cliki           -- Search the common lisp wiki
-cnn             -- Search on CNN (cnn.com)
-codesearch      -- Search source code using Google Code Search (www.google.com/codesearch)
-comlaw          -- Search Australian Law using Comlaw (www.comlaw.gov.au)
-ctan            -- Search the Comprehensive TeX Archive Network (ctan.org)
-currency        -- Convert currencies with the Universal Currency Converter (www.xe.net/ucc)
-cve             -- Search for CAN assignments in CVE
-debbugs         -- Search the debian BTS (bugs.debian.org)
-debcontents     -- Search contents of debian/ubuntu packages (packages.debian.org/packages.ubuntu.com)
-deblists        -- Search debian mailing lists (lists.debian.org/search.html)
-deblogs         -- Show changelogs for a package in Debian main (changelogs.debian.net)
-debpackages     -- Search debian/ubuntu packages (packages.debian.org/packages.ubuntu.com)
-debpkghome      -- Visit the home page for a Debian package
-debpts          -- Search the Debian Package Tracking System (packages.qa.debian.org)
-debsec          -- Search the Debian Security Tracker for CVE ids or package names
-debvcsbrowse    -- Browse the VCS repository for a Debian package
-debwiki         -- Search the Debian Wikis (wiki.debian.org & women.debian.org/wiki)
-deja            -- Search usenet using Google Groups (groups.google.com)
-discogs         -- Search the Discogs database of music information (www.discogs.com)
-dmoz            -- Search the Open Directory Project web directory (dmoz.org)
-duckduckgo      -- Search the web using Duckduckgo (www.duckduckgo.com)
-ebay            -- Search the Ebay auction site
-etym            -- Look up word origins at www.etymonline.com
-excite          -- Search on Excite (www.excite.com)
-fast            -- Search the web using FAST Search (www.alltheweb.com)
-filesearching   -- Search files on filesearching (www.filesearching.com)
-finkpkg         -- Search Fink packages (pdb.finkproject.org)
-foldoc          -- The Free On-Line Dictionary Of Computing (foldoc.org)
-freebsd         -- Search FreeBSD related information (www.freebsd.org)
-freedb          -- Search for cd track listings in FreeDB (www.freedb.org)
-freshmeat       -- Search Freshmeat (www.freshmeat.net)
-fsfdir          -- Search the FSF/UNESCO Free Software Directory (directory.fsf.org)
-gcache          -- Search the web using Google cache (www.google.com)
-genbugs         -- Search the Gentoo bug tracker (bugs.gentoo.org)
-genportage      -- Search gentoo-portage.com for packages
-google          -- Search the web using Google (www.google.com)
-gutenberg       -- Search for books on Project Gutenberg (gutenberg.org)
-happypenguin    -- Search the Linux Game Tome (www.happypenguin.org)
-imdb            -- Search the Internet Movie Database (www.imdb.com)
-ixquick         -- Search the web using ixquick (www.ixquick.com)
-jamendo         -- Search Jamendo: free music with Creative Commons licenses (www.jamendo.com)
-javasun         -- Search Java API docs (java.sun.com)
-l1sp            -- Search lisp documentation
-lastfm          -- Search last.fm
-leodict         -- Search Leo's German <-> English dictionary (dict.leo.org)
-lsm             -- Search the Linux Software Map
-macports        -- Search macports packages (macports.org)
-mathworld       -- Search Wolfram MathWorld
-mininova        -- Search the mininova bittorent source.
-musicbrainz     -- Search MusicBrainz (musicbrainz.org)
-netbsd          -- Search NetBSD related information (www.netbsd.org)
-ntrs            -- Search the NASA Technical Report Server
-openbsd         -- Search OpenBSD related information (www.openbsd.org)
-opensearch      -- Search an OpenSearch-enabled website
-pgpkeys         -- Search the PGP key database
-piratebay       -- Search thepiratebay.org for torrents
-port            -- Look up a TCP/UDP port number on seifried.org/security/ports/
-pubmed          -- Search medical/molbio databases (www.ncbi.nlm.nih.gov)
-rae             -- Busca en el diccionario de la Real Academia de la Lengua Española (Spanish Dictionary)
-rfc             -- Search RFCs (internet standards documents)
-rhyme           -- Search for rhymes et al using Lycos Rhyme (rhyme.lycos.com)
-rpmsearch       -- Search for RPMs in various distros
-scholar         -- Search Google Scholar (scholar.google.com)
-scicom          -- Search Scientific Commons
-scpan           -- Search the Comprehensive Perl Archive Network (search.cpan.org)
-scroogle        -- Search Google anonymously via Scroogle (www.scroogle.org)
-slashdot        -- Search stories on Slashdot (www.slashdot.org)
-slinuxdoc       -- Search entries in LDP (www.linuxdoc.org)
-sourceforge     -- Search SourceForge (www.sourceforge.net)
-springer        -- Search Springer for Books and Articles
-stockquote      -- Get a single stock quote (multiple providers)
-sunonesearch    -- Search Sun One Search (onesearch.sun.com)
-thesaurus       -- Look up word in Merriam-Webster's Thesaurus (www.m-w.com)
-translate       -- Translate human languages (various providers)
-urban           -- Search urbandictionary.com for a definition
-W               -- Activate Surfraw defined web-browser
-w3css           -- Validate a CSS URL with the w3c CSS validator (jigsaw.w3.org/css-validator)
-w3html          -- Validate a web page URL with the w3c validator (validator.w3.org)
-w3link          -- Check web page links with the w3c linkchecker (validator.w3.org/checklink)
-w3rdf           -- Validate a RDF URL with the w3c RDF validator (validator.w3.org)
-wayback         -- Search The Internet Archive's Wayback Machine for a URL (archive.org)
-webster         -- Look up word in Merriam-Webster's Dictionary (www.m-w.com)
-wetandwild      -- Real time weather information (many sources)
-wikipedia       -- Search the free encyclopedia wikipedia
-woffle          -- Search the web using Woffle (localhost:8080)
-yahoo           -- Search Yahoo categories (www.yahoo.com)
-youtube         -- Search YouTube (www.youtube.com)
-yubnub          -- Use the social command-line for the web (yubnub.org)
+W                 -- Activate Surfraw defined web-browser
+acronym           -- Look for acronyms definitions (www.acronymfinder.com)
+ads               -- Search SAO/NASA Astrophysics Data System
+alioth            -- Search Alioth (alioth.debian.org)
+amazon            -- Search the amazon.com bookstore
+archpkg           -- Search Arch Linux packages (www.archlinux.org)
+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)
+bbcnews           -- Search BBC News (news.bbc.co.uk)
+bing              -- Search the web using Microsoft's Bing (www.bing.com)
+bookfinder        -- Search for books using www.bookfinder.com
+bugmenot          -- Bypass compulsory web registration with bugmenot.com
+cia               -- Search CIA documents at www.cia.gov
+cite              -- Search computer science papers (citeseerx.ist.psu.edu)
+cliki             -- Search the common lisp wiki
+cnn               -- Search on CNN (cnn.com)
+codesearch        -- Search source code using Google Code Search (www.google.com/codesearch)
+comlaw            -- Search Australian Law using Comlaw (www.comlaw.gov.au)
+ctan              -- Search the Comprehensive TeX Archive Network (ctan.org)
+currency          -- Convert currencies with the Universal Currency Converter (www.xe.net/ucc)
+cve               -- Search for CAN assignments in CVE
+debbugs           -- Search the debian BTS (bugs.debian.org)
+debcontents       -- Search contents of debian/ubuntu packages (packages.debian.org/packages.ubuntu.com)
+deblists          -- Search debian mailing lists (lists.debian.org/search.html)
+deblogs           -- Show changelogs for a package in Debian main (changelogs.debian.net)
+debpackages       -- Search debian/ubuntu packages (packages.debian.org/packages.ubuntu.com)
+debpkghome        -- Visit the home page for a Debian package
+debpts            -- Search the Debian Package Tracking System (packages.qa.debian.org)
+debsec            -- Search the Debian Security Tracker for CVE ids or package names
+debvcsbrowse      -- Browse the VCS repository for a Debian package
+debwiki           -- Search the Debian Wikis (wiki.debian.org & women.debian.org/wiki)
+deja              -- Search usenet using Google Groups (groups.google.com)
+discogs           -- Search the Discogs database of music information (www.discogs.com)
+dmoz              -- Search the Open Directory Project web directory (dmoz.org)
+duckduckgo        -- Search the web using Duckduckgo (www.duckduckgo.com)
+ebay              -- Search the Ebay auction site
+etym              -- Look up word origins at www.etymonline.com
+excite            -- Search on Excite (www.excite.com)
+filesearching     -- Search files on filesearching (www.filesearching.com)
+finkpkg           -- Search Fink packages (pdb.finkproject.org)
+foldoc            -- The Free On-Line Dictionary Of Computing (foldoc.org)
+freebsd           -- Search FreeBSD related information (www.freebsd.org)
+freedb            -- Search for cd track listings in FreeDB (www.freedb.org)
+freshmeat         -- Search Freshmeat (www.freshmeat.net)
+fsfdir            -- Search the FSF/UNESCO Free Software Directory (directory.fsf.org)
+gcache            -- Search the web using Google cache (www.google.com)
+genbugs           -- Search the Gentoo bug tracker (bugs.gentoo.org)
+genportage        -- Search gentoo-portage.com for packages
+google            -- Search the web using Google (www.google.com)
+gutenberg         -- Search for books on Project Gutenberg (gutenberg.org)
+happypenguin      -- Search the Linux Game Tome (www.happypenguin.org)
+imdb              -- Search the Internet Movie Database (www.imdb.com)
+ixquick           -- Search the web using ixquick [HTTPS] (www.ixquick.com)
+jamendo           -- Search Jamendo: free music with Creative Commons licenses (www.jamendo.com)
+javasun           -- Search Java API docs (java.sun.com)
+l1sp              -- Search lisp documentation
+lastfm            -- Search last.fm
+leodict           -- Search Leo's German <-> English dictionary (dict.leo.org)
+lsm               -- Search the Linux Software Map
+macports          -- Search macports packages (macports.org)
+mathworld         -- Search Wolfram MathWorld
+mininova          -- Search the mininova bittorent source.
+musicbrainz       -- Search MusicBrainz (musicbrainz.org)
+netbsd            -- Search NetBSD related information (www.netbsd.org)
+ntrs              -- Search the NASA Technical Report Server
+openbsd           -- Search OpenBSD related information (www.openbsd.org)
+opensearch        -- Search an OpenSearch-enabled website
+pgpkeys           -- Search the PGP key database
+piratebay         -- Search thepiratebay.org for torrents
+port              -- Look up a TCP/UDP port number on seifried.org/security/ports/
+pubmed            -- Search medical/molbio databases (www.ncbi.nlm.nih.gov)
+rae               -- Busca en el diccionario de la Real Academia de la Lengua Española (Spanish Dictionary)
+rfc               -- Search RFCs (internet standards documents)
+rhyme             -- Search for rhymes et al using Lycos Rhyme (rhyme.lycos.com)
+rpmsearch         -- Search for RPMs in various distros
+scholar           -- Search Google Scholar (scholar.google.com)
+scicom            -- Search Scientific Commons
+scirus            -- Search for science using Scirus (scirus.com)
+scitopia          -- Search for science with scitopia.org
+scpan             -- Search the Comprehensive Perl Archive Network (search.cpan.org)
+scroogle          -- Search Google anonymously via Scroogle (www.scroogle.org)
+slashdot          -- Search stories on Slashdot (www.slashdot.org)
+slinuxdoc         -- Search entries in LDP (www.linuxdoc.org)
+sourceforge       -- Search SourceForge (www.sourceforge.net)
+springer          -- Search Springer for Books and Articles
+stockquote        -- Get a single stock quote (multiple providers)
+sunonesearch      -- Search Sun One Search (onesearch.sun.com)
+thesaurus         -- Look up word in Merriam-Webster's Thesaurus (www.m-w.com)
+translate         -- Translate human languages (various providers)
+urban             -- Search urbandictionary.com for a definition
+w3css             -- Validate a CSS URL with the w3c CSS validator (jigsaw.w3.org/css-validator)
+w3html            -- Validate a web page URL with the w3c validator (validator.w3.org)
+w3link            -- Check web page links with the w3c linkchecker (validator.w3.org/checklink)
+w3rdf             -- Validate a RDF URL with the w3c RDF validator (validator.w3.org)
+wayback           -- Search The Internet Archive's Wayback Machine for a URL (archive.org)
+webster           -- Look up word in Merriam-Webster's Dictionary (www.m-w.com)
+wetandwild        -- Real time weather information (many sources)
+wikipedia         -- Search the free encyclopedia wikipedia
+woffle            -- Search the web using Woffle (localhost:8080)
+worldwidescience  -- Search for science with www.worldwidescience.org
+yahoo             -- Search Yahoo categories (www.yahoo.com)
+yandex            -- Search the web using Yandex (yandex.ru)
+youtube           -- Search YouTube (www.youtube.com)
+yubnub            -- Use the social command-line for the web (yubnub.org)
 
   All elvi have useful low calorie help, for example:
 
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index 76dccc2..7be399f 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -6,7 +6,6 @@ dist_elvi_SCRIPTS	= \
 		  acronym \
 		  ads \
 		  alioth \
-		  altavista \
 		  amazon \
 		  archpkg \
 		  arxiv \
@@ -17,7 +16,6 @@ dist_elvi_SCRIPTS	= \
 		  bbcnews \
 		  bookfinder \
 		  bugmenot \
-		  cddb \
 		  cia \
 		  cite \
 		  cliki \
@@ -44,7 +42,6 @@ dist_elvi_SCRIPTS	= \
 		  ebay \
 		  etym \
 		  excite \
-		  fast \
 		  foldoc \
 		  filesearching \
 		  finkpkg \
@@ -83,6 +80,8 @@ dist_elvi_SCRIPTS	= \
 		  rpmsearch \
 		  scholar \
 		  scicom \
+		  scitopia \
+		  scirus \
 		  scpan \
 		  scroogle \
 		  slashdot \
@@ -103,6 +102,7 @@ dist_elvi_SCRIPTS	= \
 		  wetandwild \
 		  wikipedia \
 		  woffle \
+		  worldwidescience \
 		  yahoo \
 		  yandex \
 		  youtube \
diff --git a/elvi/scitopia b/elvi/scitopia
index a74a692..3885281 100755
--- a/elvi/scitopia
+++ b/elvi/scitopia
@@ -1,5 +1,5 @@
 #!/bin/sh
-# elvis: scitopia		-- Search for science with scitopia.org
+# elvis: scitopia	-- Search for science with scitopia.org
 . surfraw || exit 1
 
 w3_usage_hook () {
diff --git a/elvi/worldwidescience b/elvi/worldwidescience
index c4ff6b8..594a3f1 100755
--- a/elvi/worldwidescience
+++ b/elvi/worldwidescience
@@ -1,5 +1,5 @@
 #!/bin/sh
-# elvis: worldwidescience		-- Search for science with www.worldwidescience.org
+# elvis: worldwidescience	-- Search for science with www.worldwidescience.org
 . surfraw || exit 1
 
 w3_usage_hook () {
diff --git a/links.IN b/links.IN
index 53fee67..9b54a7f 100644
--- a/links.IN
+++ b/links.IN
@@ -2,7 +2,6 @@ elvi.1sr.gz @mandir@/man1/W.1.gz
 elvi.1sr.gz @mandir@/man1/acronym.1sr.gz
 elvi.1sr.gz @mandir@/man1/ads.1sr.gz
 elvi.1sr.gz @mandir@/man1/alioth.1sr.gz
-elvi.1sr.gz @mandir@/man1/altavista.1sr.gz
 elvi.1sr.gz @mandir@/man1/amazon.1sr.gz
 elvi.1sr.gz @mandir@/man1/archpkg.1sr.gz
 elvi.1sr.gz @mandir@/man1/arxiv.1sr.gz
@@ -13,7 +12,6 @@ elvi.1sr.gz @mandir@/man1/bing.1sr.gz
 elvi.1sr.gz @mandir@/man1/bbcnews.1sr.gz
 elvi.1sr.gz @mandir@/man1/bookfinder.1sr.gz
 elvi.1sr.gz @mandir@/man1/bugmenot.1sr.gz
-elvi.1sr.gz @mandir@/man1/cddb.1sr.gz
 elvi.1sr.gz @mandir@/man1/cite.1sr.gz
 elvi.1sr.gz @mandir@/man1/cia.1sr.gz
 elvi.1sr.gz @mandir@/man1/cliki.1sr.gz
@@ -40,7 +38,6 @@ elvi.1sr.gz @mandir@/man1/duckduckgo.1sr.gz
 elvi.1sr.gz @mandir@/man1/ebay.1sr.gz
 elvi.1sr.gz @mandir@/man1/etym.1sr.gz
 elvi.1sr.gz @mandir@/man1/excite.1sr.gz
-elvi.1sr.gz @mandir@/man1/fast.1sr.gz
 elvi.1sr.gz @mandir@/man1/filesearching.1sr.gz
 elvi.1sr.gz @mandir@/man1/finkpkg.1sr.gz
 elvi.1sr.gz @mandir@/man1/foldoc.1sr.gz
@@ -79,6 +76,8 @@ elvi.1sr.gz @mandir@/man1/rhyme.1sr.gz
 elvi.1sr.gz @mandir@/man1/rpmsearch.1sr.gz
 elvi.1sr.gz @mandir@/man1/scholar.1sr.gz
 elvi.1sr.gz @mandir@/man1/scicom.1sr.gz
+elvi.1sr.gz @mandir@/man1/scitopia.1sr.gz
+elvi.1sr.gz @mandir@/man1/scirus.1sr.gz
 elvi.1sr.gz @mandir@/man1/scpan.1sr.gz
 elvi.1sr.gz @mandir@/man1/scroogle.1sr.gz
 elvi.1sr.gz @mandir@/man1/slashdot.1sr.gz
@@ -99,6 +98,7 @@ elvi.1sr.gz @mandir@/man1/webster.1sr.gz
 elvi.1sr.gz @mandir@/man1/wetandwild.1sr.gz
 elvi.1sr.gz @mandir@/man1/wikipedia.1sr.gz
 elvi.1sr.gz @mandir@/man1/woffle.1sr.gz
+elvi.1sr.gz @mandir@/man1/worldwidescience.1sr.gz
 elvi.1sr.gz @mandir@/man1/yahoo.1sr.gz
 elvi.1sr.gz @mandir@/man1/yandex.1sr.gz
 elvi.1sr.gz @mandir@/man1/youtube.1sr.gz
diff --git a/test/Makefile.am b/test/Makefile.am
index 598176b..d897fe2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,27 +1,28 @@
 EXTRA_DIST = runtests elviwithouttests README COOKIES W.test		\
-	acronym.test ads.test alioth.test altavista.test amazon.test	\
-	archpkg.test arxiv.test ask.test aur.test austlii.test		\
-	bbcnews.test bing.test bookfinder.test bugmenot.test cddb.test	\
-	cia.test cite.test cliki.test cnn.test codesearch.test		\
-	comlaw.test ctan.test currency.test cve.test debbugs.test	\
-	debcontents.test deblists.test deblogs.test debpackages.test	\
-	debpkghome.test debpts.test debsec.test debvcsbrowse.test	\
-	debwiki.test deja.test discogs.test dmoz.test duckduckgo.test	\
-	ebay.test etym.test excite.test fast.test filesearching.test	\
-	finkpkg.test foldoc.test freebsd.test freedb.test		\
-	freshmeat.test fsfdir.test gcache.test genbugs.test		\
-	genportage.test google.test gutenberg.test happypenguin.test	\
-	imdb.test ixquick.test jamendo.test javasun.test lastfm.test	\
+	acronym.test ads.test alioth.test amazon.test archpkg.test	\
+	arxiv.test ask.test aur.test austlii.test bbcnews.test		\
+	bing.test bookfinder.test bugmenot.test cia.test cite.test	\
+	cliki.test cnn.test codesearch.test comlaw.test ctan.test	\
+	currency.test cve.test debbugs.test debcontents.test		\
+	deblists.test deblogs.test debpackages.test debpkghome.test	\
+	debpts.test debsec.test debvcsbrowse.test debwiki.test		\
+	deja.test discogs.test dmoz.test duckduckgo.test ebay.test	\
+	etym.test excite.test filesearching.test finkpkg.test		\
+	foldoc.test freebsd.test freedb.test freshmeat.test		\
+	fsfdir.test gcache.test genbugs.test genportage.test		\
+	google.test gutenberg.test happypenguin.test imdb.test		\
+	ixquick.test jamendo.test javasun.test lastfm.test		\
 	leodict.test l1sp.test lsm.test macports.test mathworld.test	\
 	mininova.test musicbrainz.test netbsd.test ntrs.test		\
 	openbsd.test opensearch.test piratebay.test port.test		\
 	pgpkeys.test pubmed.test rae.test rfc.test rhyme.test		\
-	rpmsearch.test scholar.test scicom.test scpan.test		\
-	scroogle.test slashdot.test slinuxdoc.test sourceforge.test	\
-	springer.test stockquote.test sunonesearch.test thesaurus.test	\
-	translate.test urban.test w3css.test w3html.test w3link.test	\
-	w3rdf.test wayback.test webster.test wetandwild.test		\
-	wikipedia.test woffle.test yahoo.test yandex.test youtube.test	\
+	rpmsearch.test scholar.test scicom.test scitopia.test		\
+	scirus.test scpan.test scroogle.test slashdot.test		\
+	slinuxdoc.test sourceforge.test springer.test stockquote.test	\
+	sunonesearch.test thesaurus.test translate.test urban.test	\
+	w3css.test w3html.test w3link.test w3rdf.test wayback.test	\
+	webster.test wetandwild.test wikipedia.test woffle.test		\
+	worldwidescience.test yahoo.test yandex.test youtube.test	\
 	yubnub.test
 
 test:
diff --git a/test/yandex.ru b/test/yandex.test
similarity index 100%
rename from test/yandex.ru
rename to test/yandex.test

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



More information about the Surfraw-commits mailing list