nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle subdirs and symlinks in $wallpaperdir

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

BUG: 1065
This commit is contained in:
Thomas Lübking 2016-08-28 20:39:11 +02:00 committed by Mathias Gumz
parent db97f28e25
commit 2cfffee19b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/fbsetbg
View file

@ -511,7 +511,9 @@ if [ "$option" = random ]; then
exit 1 exit 1
fi fi
if [ -d "$wallpaperdir" ]; then 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 if find_it random_number; then
randomnumber=`random_number` randomnumber=`random_number`
# some shells don't support $RANDOM # some shells don't support $RANDOM
@ -531,7 +533,7 @@ if [ "$option" = random ]; then
fi fi
remember=false remember=false
#set -x #set -x
wallpaper="$wallpaperdir/`ls \"$wallpaperdir\"|sed -n ${wallpapernumber}p`" wallpaper="`echo "$available_wallpapers" | sed -n ${wallpapernumber}p`"
option=$option2 # have to choose something... option=$option2 # have to choose something...
else else
message "Invalid random wallpaper directory specified: '$wallpaperdir'." message "Invalid random wallpaper directory specified: '$wallpaperdir'."