X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Fxsession%2Fopenbox-session.in;h=cc2169f4b6956a00538c8fc779e9fc2e83249296;hb=4e9a3becb48e0dd62723769996c2f8d808d227a6;hp=e76d3203f8f74da81272ac61f2cebb6aa98ae201;hpb=12c9b56dad52af840f9694719e63e69c47930917;p=chaz%2Fopenbox

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index e76d3203..cc2169f4 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -1,10 +1,21 @@
 #!/bin/sh
 
-AUTOSTART="$HOME/.config/openbox/autostart"
+if test -n "$1"; then
+    echo "Syntax: openbox-session"
+    echo
+    echo "See the openbox-session(1) manpage for help."
+  exit
+fi
+
+AUTOSTART="$HOME/.config/openbox/autostart.sh"
+GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
 
 if test -e $AUTOSTART; then
-    # sleep for 1 second so Openbox is there before anything else
-    (sleep 1 && . $AUTOSTART) &
+    . $AUTOSTART
+else
+    if test -e $GLOBALAUTOSTART; then
+        . $GLOBALAUTOSTART
+    fi
 fi
 
 exec @bindir@/openbox "$@"