handle subdirs and symlinks in $wallpaperdir

Thanks for the base patch, kindly provided by some Anonymous coward
on the bugtracker ;-)

BUG: 1065

1 files changed, 4 insertions, 2 deletions

diff --git a/util/fbsetbg b/util/fbsetbg
index 0cf9cfb..fb6f3af 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -511,7 +511,9 @@ if [ "$option" = random ]; then
         exit 1
     fi
     if [ -d "$wallpaperdir" ]; then
-        number_of_wallpapers=`ls "$wallpaperdir"|wc -l`
+        cd "$wallpaperdir"
+        available_wallpapers=`find -L -type f ! -regex '.*/\..*'`
+        number_of_wallpapers=`echo "$available_wallpapers" | wc -l`
         if find_it random_number; then
             randomnumber=`random_number`
         # some shells don't support $RANDOM
@@ -531,7 +533,7 @@ if [ "$option" = random ]; then
         fi
         remember=false
         #set -x
-        wallpaper="$wallpaperdir/`ls \"$wallpaperdir\"|sed -n ${wallpapernumber}p`"
+        wallpaper="`echo "$available_wallpapers" | sed -n ${wallpapernumber}p`"
         option=$option2 # have to choose something...
     else
         message "Invalid random wallpaper directory specified: '$wallpaperdir'."