diff options
Diffstat (limited to 'desktop')
| -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 5d1cc6950def4..1a8f1adbad643 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 9c0fe066cd9c9..b930c84d92aea 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 |