diff options
| author |   Robby Workman | 2010-12-21 03:55:22 +0100 |
|---|---|---|
| committer | Robby Workman | 2010-12-21 03:55:22 +0100 |
| commit | 5a5a9760ce902eae37445f637cbf9950aa4dbecf (patch) | |
| tree | 1a789fec9f7ad3a38b5b75aaf251b4f9928f27d4 /desktop/enlightenment | |
| parent | 2c80188af4bfc6dfd814be3d24dd99bfa56a96f3 (diff) | |
| download | slackbuilds-5a5a9760ce902eae37445f637cbf9950aa4dbecf.tar.gz | |
desktop/enlightenment: Poke consolekit in xinitrc
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/enlightenment')
| -rw-r--r-- | desktop/enlightenment/enlightenment.SlackBuild | 2 | ||||
| -rw-r--r-- | desktop/enlightenment/xinitrc.enlightenment17 | 29 |
2 files changed, 12 insertions, 19 deletions
diff --git a/desktop/enlightenment/enlightenment.SlackBuild b/desktop/enlightenment/enlightenment.SlackBuild index 5d1cc6950d..1a8f1adbad 100644 --- a/desktop/enlightenment/enlightenment.SlackBuild +++ b/desktop/enlightenment/enlightenment.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=enlightenment VERSION=${VERSION:-0.16.999.52995} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/desktop/enlightenment/xinitrc.enlightenment17 b/desktop/enlightenment/xinitrc.enlightenment17 index 9c0fe066cd..b930c84d92 100644 --- a/desktop/enlightenment/xinitrc.enlightenment17 +++ b/desktop/enlightenment/xinitrc.enlightenment17 @@ -3,26 +3,19 @@ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/lib/X11/xinit/.Xresources -sysmodmap=/usr/lib/X11/xinit/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps +[ -f $sysresources ] && xrdb -merge $sysresources +[ -f $sysmodmap ] && xmodmap $sysmodmap +[ -f $userresources ] && xrdb -merge $userresources +[ -f $usermodmap ] && xmodmap $usermodmap -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap +# Start the window manager: +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session enlightenment_start +else + exec enlightenment_start fi -# Start the window manager: -exec /usr/bin/enlightenment_start |