diff options
Diffstat (limited to 'util/fbsetbg')
-rw-r--r-- | util/fbsetbg | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/util/fbsetbg b/util/fbsetbg index a12d427..9047be2 100644 --- a/util/fbsetbg +++ b/util/fbsetbg | |||
@@ -58,7 +58,7 @@ command="`basename \"$0\"`" | |||
58 | display_usage() { | 58 | display_usage() { |
59 | cat << EOF | 59 | cat << EOF |
60 | Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA] /path/to/wallpaper | 60 | Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA] /path/to/wallpaper |
61 | $command [-u/-U [wallpapersetter]] [-fFcCtTaA] -r/-R /path/to/wallpaperdirectory | 61 | $command [-u/-U [wallpapersetter]] [-fFcCtTaA] -r/-R /path/to/directory |
62 | $command [-b/-B fbsetrootoptions] | 62 | $command [-b/-B fbsetrootoptions] |
63 | $command [-lhip] | 63 | $command [-lhip] |
64 | Use \`\`$command -h'' for a complete help message. | 64 | Use \`\`$command -h'' for a complete help message. |
@@ -72,17 +72,21 @@ display_help() { | |||
72 | 72 | ||
73 | Options: | 73 | Options: |
74 | 74 | ||
75 | -u Use specified wallpapersetter, use no argument to forget. | ||
76 | |||
75 | -f Set fullscreen wallpaper (default). | 77 | -f Set fullscreen wallpaper (default). |
76 | -c Set centered wallpaper. | 78 | -c Set centered wallpaper. |
77 | -t Set tiled wallpaper. | 79 | -t Set tiled wallpaper. |
78 | -a Set maximized wallpaper, preserving aspect. | 80 | -a Set maximized wallpaper, preserving aspect. |
79 | ( if your bgsetter doesn't support this | 81 | ( if your wallpapersetter doesn't support this |
80 | we fall back to -f ) | 82 | we fall back to -f ) |
81 | -u Use specified wallpapersetter, use no argument to forget. | 83 | |
82 | -b Forward the options to fbsetroot. | ||
83 | -r set random wallpaper from a directory | 84 | -r set random wallpaper from a directory |
84 | 85 | ||
85 | -F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering. | 86 | -b Forward the rest of the arguments to fbsetroot(1). |
87 | This can be used to set solid, pattern, or gradient backgrounds. | ||
88 | |||
89 | -F,-C,-T,-A,-U,-B,-R same as lower-case, but without remembering. | ||
86 | 90 | ||
87 | -h Display this help. | 91 | -h Display this help. |
88 | 92 | ||
@@ -308,6 +312,7 @@ while [ $# -gt 0 ]; do | |||
308 | remember=false | 312 | remember=false |
309 | break | 313 | break |
310 | fi | 314 | fi |
315 | ignore_missing_wallpaper=true | ||
311 | style="style" | 316 | style="style" |
312 | shift ;; | 317 | shift ;; |
313 | -Z) | 318 | -Z) |
@@ -521,6 +526,9 @@ fi | |||
521 | 526 | ||
522 | 527 | ||
523 | if [ ! -r "$wallpaper" ]; then | 528 | if [ ! -r "$wallpaper" ]; then |
529 | if [ "$ignore_missing_wallpaper" == "true" ]; then | ||
530 | exit 0 | ||
531 | fi | ||
524 | message "Can't find wallpaper $wallpaper" | 532 | message "Can't find wallpaper $wallpaper" |
525 | exit 1 | 533 | exit 1 |
526 | fi | 534 | fi |