aboutsummaryrefslogtreecommitdiff
path: root/util/fbsetbg
diff options
context:
space:
mode:
authorThomas Lübking <thomas.luebking@gmail.com>2016-08-28 18:54:52 (GMT)
committerMathias Gumz <akira@fluxbox.org>2016-09-03 18:08:14 (GMT)
commite8021e36974bb81720d4d5658a69e2d9711d702c (patch)
tree70a5eae5330fa6293d3c25a39b50d0e628764735 /util/fbsetbg
parent2cfffee19b9848a9e39e6149cbd97e23e7adddbc (diff)
downloadfluxbox-e8021e36974bb81720d4d5658a69e2d9711d702c.zip
fluxbox-e8021e36974bb81720d4d5658a69e2d9711d702c.tar.bz2
handle DISPLAY :x and :x.0 idem
Patch originally provided by Francesco Poli to Debian BUG: 1052
Diffstat (limited to 'util/fbsetbg')
-rw-r--r--util/fbsetbg3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/fbsetbg b/util/fbsetbg
index fb6f3af..1b3e1d9 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -47,6 +47,7 @@
47wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg' 47wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg'
48lastwallpaper="${HOME}/.fluxbox/lastwallpaper" 48lastwallpaper="${HOME}/.fluxbox/lastwallpaper"
49 49
50DISPLAY=${DISPLAY%.0}
50 51
51WHOAMI=`whoami` 52WHOAMI=`whoami`
52[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin 53[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
@@ -167,7 +168,7 @@ message() {
167} 168}
168 169
169remembercommand() { 170remembercommand() {
170 grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp 171 grep -vs "|${DISPLAY}$\||${DISPLAY}\.0$" ${lastwallpaper} > ${lastwallpaper}.tmp
171 mv -f ${lastwallpaper}.tmp ${lastwallpaper} 172 mv -f ${lastwallpaper}.tmp ${lastwallpaper}
172 if [ "$option" = fbsetroot ]; then 173 if [ "$option" = fbsetroot ]; then
173 echo $option"|$wallpaper|$style|"$DISPLAY >> $lastwallpaper 174 echo $option"|$wallpaper|$style|"$DISPLAY >> $lastwallpaper