summaryrefslogtreecommitdiff
path: root/data/xsession/openbox-session.in
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-15 02:02:40 +0000
committerDana Jansens <danakj@orodu.net>2007-05-15 02:02:40 +0000
commitb74cff0302e70d702e958a8205a6f6e2e2858192 (patch)
tree2befabba0b24c6d115636f3a1bc335760cc3fb5a /data/xsession/openbox-session.in
parent5d85502e3b12ae2301b28d624d7fa60a66f646bb (diff)
changes to the manual pages.
adding openbox-session. add paths to the xsession .desktop files
Diffstat (limited to 'data/xsession/openbox-session.in')
-rw-r--r--data/xsession/openbox-session.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index e76d3203..c466f17d 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -1,10 +1,16 @@
#!/bin/sh
-AUTOSTART="$HOME/.config/openbox/autostart"
+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) &
+else
+ if test -e $GLOBALAUTOSTART; then
+ # sleep for 1 second so Openbox is there before anything else
+ (sleep 1 && . $GLOBALAUTOSTART) &
+ fi
fi
exec @bindir@/openbox "$@"