Don't let autostart checking for background-setting tools end up in logs (Fix bug...

[mikachu/openbox.git] / data / autostart / openbox-autostart.in

diff --git a/data/autostart/openbox-autostart.in b/data/autostart/openbox-autostart.in
index 3b2f5ec..5c72777 100755 (executable)
--- a/data/autostart/openbox-autostart.in
+++ b/data/autostart/openbox-autostart.in
@@ -2,16 +2,16 @@
 
 # Set a background color
 BG=""
-if which hsetroot >/dev/null; then
+if which hsetroot >/dev/null 2>/dev/null; then
   BG=hsetroot
-elif which esetroot >/dev/null; then
+elif which esetroot >/dev/null 2>/dev/null; then
   BG=esetroot
-elif which xsetroot >/dev/null; then
+elif which xsetroot >/dev/null 2>/dev/null; then
   BG=xsetroot
 fi
 test -z $BG || $BG -solid "#303030"
 
-GLOBALAUTOSTART="@configdir@/autostart"
+GLOBALAUTOSTART="@rcdir@/autostart"
 AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart"
 
 # Run the global openbox autostart script
@@ -31,4 +31,4 @@ fi
 # Run the XDG autostart stuff.  These are found in /etc/xdg/autostart and
 # in $HOME/.config/autostart.  This requires PyXDG to be installed.
 # See openbox-xdg-autostart --help for more details.
-@libexecdir@/openbox-xdg-autostart OPENBOX
+@libexecdir@/openbox-xdg-autostart "$@"