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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 949c3529b2c925301061abb575bc2c7e95ea7631
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Wed Jan 12 14:05:10 2011 +0000

    renamed variables, etc in duckduckgo to match new name (current version originally came from Kyle's ddg)

diff --git a/elvi/duckduckgo b/elvi/duckduckgo
index bdad209..c72cbad 100755
--- a/elvi/duckduckgo
+++ b/elvi/duckduckgo
@@ -1,20 +1,20 @@
 #!/bin/sh
-# elvis: ddg            -- Securely search the web using duckduckgo (www.duckduckgo.com)
+# elvis: duckduckgo            -- Securely search the web using duckduckgo (www.duckduckgo.com)
 # coder at kyleisom.net 20110105
 # relevant: https://duckduckgo.com/params.html
 # similar to duckduckgo elvi, adds more options and defaults to SSL.
 . surfraw || exit 1
 
 w3_config_hook () {
-    def     SURFRAW_ddg_results             "$SURFRAW_results"
-    def     SURFRAW_ddg_base_url            "www.duckduckgo.com"
-    def     SURFRAW_ddg_search              search
-    def     SURFRAW_ddg_params              "&kg=g"
-    defyn   SURFRAW_ddg_https_arg           0
-    defyn   SURFRAW_ddg_safe_arg            0
-    defyn   SURFRAW_ddg_redirect_arg        0
-    defyn   SURFRAW_ddg_use_javascript      0
-    defyn   SURFRAW_ddg_got_a_ducky_feeling 0
+    def     SURFRAW_duckduckgo_results             "$SURFRAW_results"
+    def     SURFRAW_duckduckgo_base_url            "www.duckduckgo.com"
+    def     SURFRAW_duckduckgo_search              search
+    def     SURFRAW_duckduckgo_params              "&kg=g"
+    defyn   SURFRAW_duckduckgo_https_arg           0
+    defyn   SURFRAW_duckduckgo_safe_arg            0
+    defyn   SURFRAW_duckduckgo_redirect_arg        0
+    defyn   SURFRAW_duckduckgo_use_javascript      0
+    defyn   SURFRAW_duckduckgo_got_a_ducky_feeling 0
 }
 
 w3_usage_hook () {
@@ -36,11 +36,11 @@ w3_parse_option_hook () {
     opt="$1"
     optarg="$2"
     case "$opt" in
-    -d*|-l*)            setoptyn    SURFRAW_ddg_got_a_ducky_feeling 1 ;;
-    -j|-javascript*)    setoptyn    SURFRAW_ddg_use_javascript      1 ;;
-    -p|-safe*)		setoptyn    SURFRAW_ddg_safe_arg            1 ;;
-    -r|-redirect*)      setoptyn    SURFRAW_ddg_redirect_arg        1 ;;
-    -s|-sec*)           setoptyn    SURFRAW_ddg_https_arg           1 ;;
+    -d*|-l*)            setoptyn    SURFRAW_duckduckgo_got_a_ducky_feeling 1 ;;
+    -j|-javascript*)    setoptyn    SURFRAW_duckduckgo_use_javascript      1 ;;
+    -p|-safe*)		setoptyn    SURFRAW_duckduckgo_safe_arg            1 ;;
+    -r|-redirect*)      setoptyn    SURFRAW_duckduckgo_redirect_arg        1 ;;
+    -s|-sec*)           setoptyn    SURFRAW_duckduckgo_https_arg           1 ;;
     *) return 1 ;;
     esac
     return 0
@@ -49,34 +49,34 @@ w3_parse_option_hook () {
 w3_config
 w3_parse_args "$@"
 # w3_args now contains a list of arguments
-    
-if [ "${SURFRAW_ddg_https_arg}" = 0 ] ; then
-    SURFRAW_ddg_base_url="https://${SURFRAW_ddg_base_url}"
+
+if [ "${SURFRAW_duckduckgo_https_arg}" = 0 ] ; then
+    SURFRAW_duckduckgo_base_url="https://${SURFRAW_duckduckgo_base_url}"
 else
-    SURFRAW_ddg_base_url="http://${SURFRAW_ddg_base_url}"
+    SURFRAW_duckduckgo_base_url="http://${SURFRAW_duckduckgo_base_url}"
 fi
 
 # need to send the user to the non-javascript version if using a non-graphical
 # browser
-if [ "$SURFRAW_ddg_use_javascript" = 0 ]; then
-    SURFRAW_ddg_base_url="${SURFRAW_ddg_base_url}/lite"
+if [ "$SURFRAW_duckduckgo_use_javascript" = 0 ]; then
+    SURFRAW_duckduckgo_base_url="${SURFRAW_duckduckgo_base_url}/lite"
 fi
 
-if [ "$SURFRAW_ddg_safe_arg" = 1 ]; then
-    SURFRAW_ddg_params="${SURFRAW_ddg_params}&kp=1"
+if [ "$SURFRAW_duckduckgo_safe_arg" = 1 ]; then
+    SURFRAW_duckduckgo_params="${SURFRAW_duckduckgo_params}&kp=1"
 fi
 
-if [ "$SURFRAW_ddg_redirect_arg" = 1 ] ; then
-    SURFRAW_ddg_params="${SURFRAW_ddg_params}&kd=1"
+if [ "$SURFRAW_duckduckgo_redirect_arg" = 1 ] ; then
+    SURFRAW_duckduckgo_params="${SURFRAW_duckduckgo_params}&kd=1"
 fi
 
 if [ "$SURFRAW_graphical" != "yes" ] ; then
-    SURFRAW_ddg_params="${SURFRAW_ddg_params}&kf=-1&kz=-1&kq=-1&kv=-1"
+    SURFRAW_duckduckgo_params="${SURFRAW_duckduckgo_params}&kf=-1&kz=-1&kq=-1&kv=-1"
 fi
 
 escaped_args=`w3_url_of_arg $w3_args`
-if [ "$SURFRAW_ddg_got_a_ducky_feeling" = 1 ]; then
+if [ "$SURFRAW_duckduckgo_got_a_ducky_feeling" = 1 ]; then
     escaped_args="! ${escaped args}"
 fi
 
-w3_browse_url "${SURFRAW_ddg_base_url}/?q=${escaped_args}${SURFRAW_ddg_params}"
+w3_browse_url "${SURFRAW_duckduckgo_base_url}/?q=${escaped_args}${SURFRAW_duckduckgo_params}"

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