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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 5c274dec555e6d28e069d55de79e0f0306d7795e
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Tue Nov 10 20:15:55 2009 +0000

    surfraw.IN: only list local elvi if $localelvidir contains files.

diff --git a/ChangeLog b/ChangeLog
index 7f9401a..ec437b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* New elvi: acronym, gcache (google cache).
 	  Thanks to fittabile at lifegate.it
+	* surfraw.IN: only list local elvi if $localelvidir contains files.
 
 2009-11-08  Ian Beckwith  <ianb at erislabs.net>
 
diff --git a/surfraw.IN b/surfraw.IN
index 2e8f6c0..afb89ab 100644
--- a/surfraw.IN
+++ b/surfraw.IN
@@ -321,7 +321,7 @@ w3_parse_option () {
 	-elvi)		    echo " GLOBAL ELVI:"
 			    sed -n 's/^.*elvis: \(.*\)$/\1/p' $elvidir/*
 			    localelvidir=$(get_local_elvi_dir)
-			    if [ -d "$localelvidir" ]; then
+			    if [ -d "$localelvidir" ] && [ -n "$(ls "$localelvidir")" ]; then
 				echo " LOCAL ELVI:"
 				sed -n 's/^.*elvis: \(.*\)$/\1/p' "$localelvidir/"*
 			    fi

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