all repos — fluxbox @ 2cfffee19b9848a9e39e6149cbd97e23e7adddbc

custom fork of the fluxbox windowmanager 

handle subdirs and symlinks in $wallpaperdir

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

BUG: 1065
Thomas Lübking thomas.luebking@gmail.com
commit

2cfffee19b9848a9e39e6149cbd97e23e7adddbc

parent

db97f28e2528606cbe3cb8621ec7f8405c1f1b5d

1 files changed, 4 insertions(+), 2 deletions(-)

jump to
M util/fbsetbg → util/fbsetbg 
@@ -511,7 +511,9 @@ message "No random wallpaper directory specified."
         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 @@ remembercommand
         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'."