diff options
| author | Ryan P.C. McQuen <ryanpcmcquen@gmail.com> | 2014-02-09 12:12:38 +0700 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2014-02-11 12:15:07 -0600 |
| commit | bba614f466830d48904d490b7d9e13a2bba5c9dc (patch) | |
| tree | 56d0245875d58f504fbf80d12fee24d3fef3f0c4 /desktop/dwm | |
| parent | 6128cf4eb401eacfe7ad4cdd537fb0b2f1236236 (diff) | |
desktop/dwm: Added xinitrc.dwm.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'desktop/dwm')
| -rw-r--r-- | desktop/dwm/dwm.SlackBuild | 5 | ||||
| -rw-r--r-- | desktop/dwm/xinitrc.dwm | 32 |
2 files changed, 36 insertions, 1 deletions
diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild index aad7302fde3d4..7b8ccd9041926 100644 --- a/desktop/dwm/dwm.SlackBuild +++ b/desktop/dwm/dwm.SlackBuild @@ -34,7 +34,7 @@ PRGNAM=dwm VERSION=${VERSION:-6.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -96,6 +96,9 @@ make install \ X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \ DESTDIR=$PKG +mkdir -p $PKG/etc/X11/xinit +install -m 0755 $CWD/xinitrc.dwm $PKG/etc/X11/xinit/xinitrc.dwm + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/desktop/dwm/xinitrc.dwm b/desktop/dwm/xinitrc.dwm new file mode 100644 index 0000000000000..4cfa744f796b2 --- /dev/null +++ b/desktop/dwm/xinitrc.dwm @@ -0,0 +1,32 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +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 +fi + +# Start the window manager: +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session /usr/bin/dwm +else + exec /usr/bin/dwm +fi + |