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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit b1acf69c3e080f3cad2320179414a13117fd79cf
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Tue Oct 27 03:03:40 2009 +0000

    Updated uzbl-load-url-from-surfraw to use new bookmark locations.

diff --git a/ChangeLog b/ChangeLog
index d5f1f2e..95ec743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Added examples/uzbl-load-url-from-surfraw,
 	  thanks to Sumant Oemrawsingh.
+	* Updated uzbl-load-url-from-surfraw to use new bookmark locations.
 	* Fixed debsec (Thanks to Moritz Muehlenhoff, for this
 	  and all his other work).
 	* Fixed cia.
diff --git a/examples/uzbl_load_url_from_surfraw b/examples/uzbl_load_url_from_surfraw
old mode 100644
new mode 100755
index 4aae147..a9296ba
--- a/examples/uzbl_load_url_from_surfraw
+++ b/examples/uzbl_load_url_from_surfraw
@@ -27,7 +27,13 @@
 DEFAULT_SEARCH=google
 
 # The location of the surfraw bookmark file
-BOOKMARKS="$HOME/.surfraw.bookmarks"
+if [ -n "$XDG_CONFIG_HOME" -a -e "$XDG_CONFIG_HOME/surfraw/bookmarks" ]; then
+    BOOKMARKS="$XDG_CONFIG_HOME/surfraw/bookmarks"
+elif [ -e "$HOME/.config/surfraw/bookmarks" ]; then
+    BOOKMARKS="$HOME/.config/surfraw/bookmarks"
+else
+    BOOKMARKS="$HOME/.surfraw.bookmarks"
+fi
 
 # Colors for dmenu
 COLORS=" -nb #303030 -nf khaki -sb #CCFFAA -sf #303030"

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