From cffff4ff003fb9f50a71e281ed7a7947c65fa040 Mon Sep 17 00:00:00 2001
From: Stefan Ritter <xeno@thehappy.de>
Date: Wed, 20 Apr 2011 13:10:56 +0200
Subject: Several changes

---
 xorg/xinitrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg')

diff --git a/xorg/xinitrc b/xorg/xinitrc
index c9a4cf2..af1599c 100755
--- a/xorg/xinitrc
+++ b/xorg/xinitrc
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WM='fvwm2'
-WALLPAPER='media/bilder/wallpaper/wood_3.png'
+WALLPAPER='media/bilder/wallpaper/leaf.jpg'
 
 setxkbmap de neo
 xset +fp /usr/share/fonts/local
@@ -13,7 +13,7 @@ if [ -e /usr/bin/xrandr ]; then
 	fi
 fi
 
-if [ -e "$WALLPAPER" -a /usr/bin/feh]; then
+if [ -e "$WALLPAPER" ] && [ -e /usr/bin/feh ]; then
 	feh --bg-scale $WALLPAPER
 fi
 
-- 
cgit v1.2.3