aboutsummaryrefslogtreecommitdiff
path: root/util/fbsetbg
diff options
context:
space:
mode:
authormathias <mathias>2005-07-12 04:56:05 (GMT)
committermathias <mathias>2005-07-12 04:56:05 (GMT)
commit1fe9ef3056e80dfed05bbb1b00443c11a64223c1 (patch)
tree3fbae0cada70fe79e939d6c32c7dcb2786b6a816 /util/fbsetbg
parent9531144097b7fdae1051933fd2aa89c8928b72b2 (diff)
downloadfluxbox_pavel-1fe9ef3056e80dfed05bbb1b00443c11a64223c1.zip
fluxbox_pavel-1fe9ef3056e80dfed05bbb1b00443c11a64223c1.tar.bz2
Renaming of 'bsetroot' to 'fbsetroot' (Mathias)
blackbox's 'bsetroot' and fluxbox's 'bsetroot' have different syntax nowadays and collide when you install fluxbox and blackbox. hence the renaming.
Diffstat (limited to 'util/fbsetbg')
-rw-r--r--util/fbsetbg14
1 files changed, 7 insertions, 7 deletions
diff --git a/util/fbsetbg b/util/fbsetbg
index a75f461..eaa1f9d 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -61,7 +61,7 @@ display_usage() {
61 cat << EOF 61 cat << EOF
62Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA /path/to/wallpaper] 62Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA /path/to/wallpaper]
63 [-r/-R /path/to/wallpaperdirectory] 63 [-r/-R /path/to/wallpaperdirectory]
64 [-b/-B bsetrootoptions] [-l] [-h] [-i] [-p] 64 [-b/-B fbsetrootoptions] [-l] [-h] [-i] [-p]
65Use \`\`$command -h'' for a complete help message. 65Use \`\`$command -h'' for a complete help message.
66 66
67EOF 67EOF
@@ -80,7 +80,7 @@ Options:
80 ( if your bgsetter doesn't support this 80 ( if your bgsetter doesn't support this
81 we fall back to -f ) 81 we fall back to -f )
82 -u Use specified wallpapersetter, use no argument to forget. 82 -u Use specified wallpapersetter, use no argument to forget.
83 -b Forward the options to bsetroot. 83 -b Forward the options to fbsetroot.
84 -r set random wallpaper from a directory 84 -r set random wallpaper from a directory
85 85
86 -F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering. 86 -F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering.
@@ -174,7 +174,7 @@ message() {
174remembercommand() { 174remembercommand() {
175 grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp 175 grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp
176 mv -f ${lastwallpaper}.tmp ${lastwallpaper} 176 mv -f ${lastwallpaper}.tmp ${lastwallpaper}
177 if [ "$option" = bsetroot ]; then 177 if [ "$option" = fbsetroot ]; then
178 echo $option'|'$wallpaper'|'$DISPLAY >> $lastwallpaper 178 echo $option'|'$wallpaper'|'$DISPLAY >> $lastwallpaper
179 return 179 return
180 fi 180 fi
@@ -262,11 +262,11 @@ while [ $# -gt 0 ]; do
262 wallpaper=$2 262 wallpaper=$2
263 remember=false 263 remember=false
264 break ;; 264 break ;;
265 -b) option=bsetroot 265 -b) option=fbsetroot
266 shift 266 shift
267 wallpaper=$* 267 wallpaper=$*
268 break ;; 268 break ;;
269 -B) option=bsetroot 269 -B) option=fbsetroot
270 shift 270 shift
271 wallpaper=$* 271 wallpaper=$*
272 remember=false 272 remember=false
@@ -461,8 +461,8 @@ if [ -z "$DISPLAY" ]; then
461fi 461fi
462 462
463 463
464if [ "$option" = bsetroot ]; then 464if [ "$option" = fbsetroot ]; then
465 bsetroot $wallpaper 465 fbsetroot $wallpaper
466 if [ ! "$remember" = false ]; then 466 if [ ! "$remember" = false ]; then
467 remembercommand 467 remembercommand
468 fi 468 fi