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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 9a9194a32e612c26dd8766af5b4ac8fce05ae135
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Fri Nov 6 03:36:43 2009 +0000

    present_menu(): use awk(1) instead of cut(1), so tabs in bookmark files are handled correctly

diff --git a/ChangeLog b/ChangeLog
index e54e3bf..7a35c0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	  + Applied patch from Sumant Oemrawsingh to strip "GLOBAL ELVI"
 	    and "LOCALELVI" and support vertical menus if patched dmenu is
 	    available.
+	  + present_menu(): use awk(1) instead of cut(1), so tabs in
+	    bookmark files are handled correctly.
 
 2009-10-27  Ian Beckwith  <ianb at erislabs.net>
 
diff --git a/examples/uzbl_load_url_from_surfraw b/examples/uzbl_load_url_from_surfraw
index bf2ef4c..37572ef 100755
--- a/examples/uzbl_load_url_from_surfraw
+++ b/examples/uzbl_load_url_from_surfraw
@@ -80,7 +80,7 @@ function present_menu()
   elvi=`surfraw -elvi | grep -v -e ' ELVI:' -e '^W' | cut -f 1`
   if [ -r "$BOOKMARKS" ]
   then
-    elvi="$elvi `cut -f 1 -d ' ' "$BOOKMARKS" 2>/dev/null`"
+    elvi="$elvi $(awk '{print $1}' "$BOOKMARKS" 2>/dev/null)"
   fi
 
   echo "$elvi" | tr ' ' '\n' | sort | $DMENU -p "$PROMPT" $COLORS

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