[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, 2.2.9_release_candidate, updated. surfraw_2-2-5_1-245-gde6509c
Ian Beckwith
ianb at erislabs.net
Mon Oct 22 16:42:04 UTC 2012
The following commit has been merged in the 2.2.9_release_candidate branch:
commit de6509c6e0e32f71df0bd68d71d5c2e4918b1e4e
Author: Ian Beckwith <ianb at erislabs.net>
Date: Mon Oct 22 17:41:59 2012 +0100
remove scroogle: site gone
diff --git a/ChangeLog b/ChangeLog
index d3aa2f1..aece9e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-22 Ian Beckwith <ianb at erislabs.net>
+
+ * Removed elvi: scroogle (site gone).
+ * test/Makefile.am: Added missing tests to EXTRA_DIST
+
2012-06-28 Manolo Martínez <manolo at austrohungaro.com>
* examples/hooks.lua: Added elinks integration script
diff --git a/README b/README
index 3208bde..252aed4 100644
--- a/README
+++ b/README
@@ -245,7 +245,6 @@ 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)
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index 4e26d23..d234ae0 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -93,7 +93,6 @@ dist_elvi_SCRIPTS = \
scitopia \
scirus \
scpan \
- scroogle \
slashdot \
slinuxdoc \
sourceforge \
diff --git a/elvi/scroogle b/elvi/scroogle
deleted file mode 100755
index 447f77a..0000000
--- a/elvi/scroogle
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-# elvis: scroogle -- Search Google anonymously via Scroogle (www.scroogle.org)
-# ianb at erislabs.net 20100416
-. surfraw || exit 1
-
-w3_config_hook () {
- def SURFRAW_scroogle_results 20
- defyn SURFRAW_scroogle_ssl yes
- def SURFRAW_scroogle_lang "$SURFRAW_lang"
- # number in URL of language pages
- def SURFRAW_scroogle_langpagever 8
-}
-
-w3_usage_hook () {
- cat <<EOF
-Usage: $w3_argv0 [options] [search words]...
-Description:
- Search Google anonymously using Scroogle (www.scroogle.org)
-Local options:
- -nossl Don't use https
- -results=NUM Number of search results returned
- Default: $SURFRAW_scroogle_results
- Environment: SURFRAW_scroogle_results
- -lang= Search for pages written in LANG.
- al | any language (default)
- ar | Arabic
- zs | Chinese (simplified)
- zt | Chinese (traditional)
- cs | Czech
- da | Danish
- nl | Dutch
- en | English
- et | Estonian
- fi | Finnish
- fr | French
- de | German
- el | Greek
- iw | Hebrew
- hu | Hungarian
- is | Icelandic
- it | Italian
- ja | Japanese
- ko | Korean
- lv | Latvian
- lt | Lithuanian
- no | Norwegian
- pt | Portuguese
- pl | Polish
- ro | Romanian
- ru | Russian
- es | Spanish
- sv | Swedish
- tr | Turkish
-EOF
- w3_global_usage
-}
-
-w3_parse_option_hook () {
- opt="$1"
- optarg="$2"
- case "$opt" in
- -results=*) setopt SURFRAW_scroogle_results "$optarg" ;;
- -lang=*) setopt SURFRAW_scroogle_lang "$optarg" ;;
- -no*) setoptyn SURFRAW_scroogle_ssl no ;;
- *) return 1 ;;
- esac
- return 0
-}
-
-w3_config
-w3_parse_args "$@"
-# w3_args now contains a list of arguments
-
-if ifno SURFRAW_scroogle_ssl; then
- base="http://www.scroogle.org"
- path="cgi-bin/nbbw.cgi"
-else
- base="https://ssl.scroogle.org"
- path="cgi-bin/nbbwssl.cgi"
-fi
-
-case "$SURFRAW_scroogle_lang" in
- al|ar|zs|zt|cs|da|nl|en|et|fi|fr|de|el|iw|hu|is|it|ja|ko|lv|lt|no|\
- pt|pl|ro|ru|es|sv|tr) lang="${SURFRAW_scroogle_lang}" ;;
- *) lang="";
-esac
-
-if test -z "$w3_args"; then
-# urls of search page:
-# http://www.scroogle.org/cgi-bin/scraper.htm
-# http://www.scroogle.org/scrap${SURFRAW_scroogle_lang}${SURFRAW_scroogle_langpagever}.html
-# https://ssl.scroogle.org/
-# https://ssl.scroogle.org/scrap${SURFRAW_scroogle_lang}${SURFRAW_scroogle_langpagever}.html
- url="${base}"
- if ifno SURFRAW_scroogle_ssl; then
- file="cgi-bin/scraper.htm"
- else
- file=""
- fi
- if test -n "$lang";then
- url="${url}/scrap${lang}${SURFRAW_scroogle_langpagever}.html"
- else
- url="${url}/${file}"
- fi
-else
- case "$SURFRAW_scroogle_results" in
- 50) results=5 ;;
- 100) results=1 ;;
- *) results=2 ;; # default = 2 == 20 results
- esac
-
- urlopts="n=${results}"
-
- if test -n "$lang";then
- urlopts="${urlopts}&l=${lang}"
- fi
-
- escaped_args=`w3_url_of_arg $w3_args`
- # Gw must come first
- url="${base}/${path}?Gw=${escaped_args}&${urlopts}"
-fi
-
-w3_browse_url "$url"
-
diff --git a/links.IN b/links.IN
index 38c002b..13cbd6f 100644
--- a/links.IN
+++ b/links.IN
@@ -87,7 +87,6 @@ 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
elvi.1sr.gz @mandir@/man1/slinuxdoc.1sr.gz
elvi.1sr.gz @mandir@/man1/sourceforge.1sr.gz
diff --git a/test/Makefile.am b/test/Makefile.am
index 35122d9..132b251 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = runtests elviwithouttests README COOKIES W.test \
openports.test opensearch.test pasearch.test pin.test \
piratebay.test pgpkeys.test priberam.test pubmed.test rae.test \
rfc.test rhyme.test rpmsearch.test scholar.test scicom.test \
- scitopia.test scirus.test scpan.test scroogle.test \
+ scitopia.test scirus.test scpan.test \
slashdot.test slinuxdoc.test sourceforge.test springer.test \
stack.test stockquote.test sunonesearch.test thesaurus.test \
translate.test urban.test w3css.test w3html.test w3link.test \
diff --git a/test/scroogle.test b/test/scroogle.test
deleted file mode 100644
index 4336526..0000000
--- a/test/scroogle.test
+++ /dev/null
@@ -1,6 +0,0 @@
-scroogle surfraw
-<a href="http://surfraw.alioth.debian.org/"><b>Surfraw</b>
-scroogle -nossl surfraw
-<a href="http://surfraw.alioth.debian.org/"><b>Surfraw</b>
-scroogle -lang=en surfraw
-<a href="http://surfraw.alioth.debian.org/"><b>Surfraw</b>
--
surfraw - a fast unix command line interface to WWW
More information about the Surfraw-commits
mailing list