handle subdirs and symlinks in $wallpaperdir
Thanks for the base patch, kindly provided by some Anonymous coward on the bugtracker ;-) BUG: 1065
This commit is contained in:
parent
db97f28e25
commit
2cfffee19b
1 changed files with 4 additions and 2 deletions
|
@ -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'."
|
||||
|
|
Loading…
Reference in a new issue