[Surfraw-commits] [surfraw] 01/01: Elvi cleanup (a-c).
Kyle Isom
kyle-guest at moszumanska.debian.org
Mon Mar 6 19:15:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
kyle-guest pushed a commit to branch kyle/https-elvi
in repository surfraw.
commit 6bcc1f4a904511082ade4d9d1280e660389cbfd0
Author: Kyle Isom <kyle at imap.cc>
Date: Mon Mar 6 11:14:26 2017 -0800
Elvi cleanup (a-c).
+ Multiple elvi redirect to https, so the elvi have been switched
to default to the https version of the site.
+ cablesearch no longer exists.
+ Several sites have changed URLs.
+ The Mandriva bugzilla no longer exists.
---
elvi/alioth | 4 ++--
elvi/amazon | 4 ++--
elvi/archpkg | 4 ++--
elvi/arxiv | 12 ++++++------
elvi/bing | 4 ++--
elvi/bugzilla | 17 ++++++++---------
elvi/cablesearch | 31 -------------------------------
elvi/cisco | 6 +++---
elvi/comlaw | 4 ++--
elvi/commandlinefu | 2 +-
elvi/ctan | 4 ++--
elvi/currency | 4 ++--
12 files changed, 32 insertions(+), 64 deletions(-)
diff --git a/elvi/alioth b/elvi/alioth
index 680cd77..2a9f438 100755
--- a/elvi/alioth
+++ b/elvi/alioth
@@ -41,8 +41,8 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://alioth.debian.org/"
+ w3_browse_url "https://alioth.debian.org/"
else
escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://alioth.debian.org/search/?words=${escaped_args}&type_of_search=$SURFRAW_alioth_searchtype"
+ w3_browse_url "https://alioth.debian.org/search/?words=${escaped_args}&type_of_search=$SURFRAW_alioth_searchtype"
fi
diff --git a/elvi/amazon b/elvi/amazon
index 0497ad7..be7ad96 100755
--- a/elvi/amazon
+++ b/elvi/amazon
@@ -200,7 +200,7 @@ case "$SURFRAW_amazon_country" in
esac
if null "$w3_args"; then
- w3_browse_url "http://${host}/"
+ w3_browse_url "https://${host}/"
else
escaped_args=`w3_url_of_arg $w3_args`
if [ "$SURFRAW_amazon_search" = books ] ; then
@@ -240,5 +240,5 @@ else
path="s/ref=nb_ss_gw"
args="url=search-alias%3D${SURFRAW_amazon_search}&field-keywords=${escaped_args}"
esac
- w3_browse_url "http://${host}/${path}?${args}"
+ w3_browse_url "https://${host}/${path}?${args}"
fi
diff --git a/elvi/archpkg b/elvi/archpkg
index 5358c51..0b73410 100755
--- a/elvi/archpkg
+++ b/elvi/archpkg
@@ -71,12 +71,12 @@ esac
# no arguments present
if [ -z "$w3_args" ]; then
- w3_browse_url "http://www.archlinux.org/packages/"
+ w3_browse_url "https://www.archlinux.org/packages/"
else
# if w3_args contains a list of arguments
escaped_args=$(w3_url_of_arg $w3_args)
-base="http://www.archlinux.org/packages/?sort="
+base="https://www.archlinux.org/packages/?sort="
# repository and architecture
if [ -n "$SURFRAW_arch_repo" -a "$SURFRAW_arch_ix" ]; then
diff --git a/elvi/arxiv b/elvi/arxiv
index 44f5fa9..0fa54af 100755
--- a/elvi/arxiv
+++ b/elvi/arxiv
@@ -114,23 +114,23 @@ fi
# Form URL
if [ -z "$w3_args" ]; then
- url="http://arXiv.org/"
+ url="https://arXiv.org/"
else
case $SURFRAW_arxiv_scope in
all)
- url="http://arXiv.org/find/all/1/all:"$terms"/0/1/0/all/0/1"
+ url="https://arXiv.org/find/all/1/all:"$terms"/0/1/0/all/0/1"
;;
title)
- url="http://arXiv.org/find/all/1/ti:"$terms"/0/1/0/all/0/1"
+ url="https://arXiv.org/find/all/1/ti:"$terms"/0/1/0/all/0/1"
;;
abstract)
- url="http://arXiv.org/find/all/1/abs:"$terms"/0/1/0/all/0/1"
+ url="https://arXiv.org/find/all/1/abs:"$terms"/0/1/0/all/0/1"
;;
author)
- url="http://arXiv.org/find/all/1/au:"$terms"/0/1/0/all/0/1"
+ url="https://arXiv.org/find/all/1/au:"$terms"/0/1/0/all/0/1"
;;
fulltext)
- url="http://search.arXiv.org:8081/?query="$terms"&in="
+ url="https://search.arXiv.org:8081/?query="$terms"&in="
;;
*)
return 1 ;;
diff --git a/elvi/bing b/elvi/bing
index 206ee6c..cd2173a 100755
--- a/elvi/bing
+++ b/elvi/bing
@@ -21,8 +21,8 @@ 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/"
+ w3_browse_url "https://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"
+ w3_browse_url "https://www.bing.com/search?q=${escaped_args}&go=&form=QBLH&filt=all"
fi
diff --git a/elvi/bugzilla b/elvi/bugzilla
index b28cab8..7a4692b 100755
--- a/elvi/bugzilla
+++ b/elvi/bugzilla
@@ -22,7 +22,7 @@ Local options:
mandriva, gentoo, novell
Default: $SURFRAW_bugzilla_site
Environment: SURFRAW_bugzilla_site
- Examples: bugzilla -s=http://bugs.kde.org ipv6
+ Examples: bugzilla -s=https://bugs.kde.org ipv6
bugzilla -s=kde ipv6
-status=open | Bug status
closed |
@@ -65,15 +65,14 @@ esac
case "$SURFRAW_bugzilla_site" in
kernel) setopt SURFRAW_bugzilla_site "https://bugzilla.kernel.org" ;;
- mozilla) setopt SURFRAW_bugzilla_site "http://bugzilla.mozilla.org" ;;
- gnome) setopt SURFRAW_bugzilla_site "http://bugzilla.gnome.org" ;;
- kde) setopt SURFRAW_bugzilla_site "http://bugs.kde.org" ;;
- apache) setopt SURFRAW_bugzilla_site "http://issues.apache.org/bugzilla" ;;
- freedesktop) setopt SURFRAW_bugzilla_site "http://bugs.freedesktop.org" ;;
+ mozilla) setopt SURFRAW_bugzilla_site "https://bugzilla.mozilla.org" ;;
+ gnome) setopt SURFRAW_bugzilla_site "https://bugzilla.gnome.org" ;;
+ kde) setopt SURFRAW_bugzilla_site "https://bugs.kde.org" ;;
+ apache) setopt SURFRAW_bugzilla_site "https://issues.apache.org/bugzilla" ;;
+ freedesktop) setopt SURFRAW_bugzilla_site "https://bugs.freedesktop.org" ;;
eclipse) setopt SURFRAW_bugzilla_site "https://bugs.eclipse.org/bugs" ;;
- redhat) setopt SURFRAW_bugzilla_site "http://bugzilla.redhat.com/bugzilla" ;;
- mandriva) setopt SURFRAW_bugzilla_site "http://qa.mandriva.com" ;;
- gentoo) setopt SURFRAW_bugzilla_site "http://bugs.gentoo.org" ;;
+ redhat) setopt SURFRAW_bugzilla_site "https://bugzilla.redhat.com/" ;;
+ gentoo) setopt SURFRAW_bugzilla_site "https://bugs.gentoo.org" ;;
novell) setopt SURFRAW_bugzilla_site "https://bugzilla.novell.com" ;;
esac
diff --git a/elvi/cablesearch b/elvi/cablesearch
deleted file mode 100755
index 982beae..0000000
--- a/elvi/cablesearch
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# elvis: cablesearch -- search for leaked diplomatic communications
-# coder at kyleisom.net 20110105
-. surfraw || exit 1
-
-w3_config_hook () {
- # for when I figured out how to parse json in surfraw...
- def SURFRAW_cablesearch_api "http://cablegatesearch.net/cable/api/search"
- def SURFRAW_cablesearch "http://cablegatesearch.net/"
-}
-
-w3_usage_hook () {
- cat <<EOF
-Usage: $w3_argv0 [options] [search words]...
-Description:
- Search leaked diplomatic cables.
-Local options:
- If you can read this, it means your hard drive has already been wiped and
- the NSA alerted to your conniving schemes.
-EOF
- w3_global_usage
-}
-
-w3_config
-w3_parse_args "$@"
-# w3_args now contains a list of arguments
-
-escaped_args=`w3_url_of_arg $w3_args`
-
-url="${SURFRAW_cablesearch}?q=${escaped_args}"
-w3_browse_url $url
diff --git a/elvi/cisco b/elvi/cisco
index c33867e..024d9b1 100755
--- a/elvi/cisco
+++ b/elvi/cisco
@@ -17,9 +17,9 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://tools.cisco.com/"
+ w3_browse_url "https://tools.cisco.com/"
else
escaped_args=`w3_url_of_arg $w3_args`
-# w3_browse_url "http://tools.cisco.com/search/JSP/search-results.get?strQueryText=${escaped_args}&Search+All+cisco.com=cisco.com"
- w3_browse_url "http://tools.cisco.com/search/results/en/us/get?q=${escaped_args}&js=0"
+# w3_browse_url "https://tools.cisco.com/search/JSP/search-results.get?strQueryText=${escaped_args}&Search+All+cisco.com=cisco.com"
+ w3_browse_url "https://tools.cisco.com/search/results/en/us/get?q=${escaped_args}&js=0"
fi
diff --git a/elvi/comlaw b/elvi/comlaw
index ad77032..3a052f3 100755
--- a/elvi/comlaw
+++ b/elvi/comlaw
@@ -16,8 +16,8 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://www.comlaw.gov.au/"
+ w3_browse_url "http://www.legislation.gov.au/"
else
escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://www.comlaw.gov.au/Search/${escaped_args}"
+ w3_browse_url "http://www.legislation.gov.au/Search/${escaped_args}"
fi
diff --git a/elvi/commandlinefu b/elvi/commandlinefu
index d3de574..e981b2c 100755
--- a/elvi/commandlinefu
+++ b/elvi/commandlinefu
@@ -46,7 +46,7 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
-url=http://www.commandlinefu.com/commands/matching
+url=https://www.commandlinefu.com/commands/matching
# The next part of the url is a normalized plaintext version of the search
# query. It seems to be unused by the CGI but it needs to be present. So we
# normalize to "x".
diff --git a/elvi/ctan b/elvi/ctan
index 52ef65c..72ed27b 100755
--- a/elvi/ctan
+++ b/elvi/ctan
@@ -40,7 +40,7 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://www.ctan.org/"
+ w3_browse_url "https://www.ctan.org/"
else
escaped_args=`w3_url_of_arg $w3_args`
if ifno SURFRAW_ctan_topics &&
@@ -50,7 +50,7 @@ else
SURFRAW_ctan_desc=1
fi
- url="http://www.ctan.org/search/?x=1&PORTAL=on"
+ url="https://www.ctan.org/search/?x=1&PORTAL=on"
url="${url}&phrase=${escaped_args}&max=${SURFRAW_results}"
if ifyes SURFRAW_ctan_topics
diff --git a/elvi/currency b/elvi/currency
index 559d22f..4787780 100755
--- a/elvi/currency
+++ b/elvi/currency
@@ -375,8 +375,8 @@ w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
if test -z "$w3_args"; then
- w3_browse_url "http://www.xe.net/ucc/"
+ w3_browse_url "http://www.xe.com/currencyconverter/"
else
escaped_args=`w3_url_of_arg $w3_args`
- w3_browse_url "http://www.xe.com/ucc/convert.cgi?Amount=${escaped_args}&From=${SURFRAW_currency_from}&To=${SURFRAW_currency_to}&submit=Perform+Currency+Conversion"
+ w3_browse_url "http://www.xe.com/currencyconverter/Amount=${escaped_args}&From=${SURFRAW_currency_from}&To=${SURFRAW_currency_to}&submit=Perform+Currency+Conversion"
fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/surfraw/surfraw.git
More information about the Surfraw-commits
mailing list