diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-25 16:43:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-25 16:43:57 +0000 |
| commit | 9526ee659401dee7160f35cb62ded2779bcbbc99 (patch) | |
| tree | 812ad73bde9c84dcc02a3acbc5db576369ca314a /x11/xinit/xinitrc | |
| parent | 05e09c1126a898b6d0af491fef0401bf53e297f8 (diff) | |
| download | aports-9526ee659401dee7160f35cb62ded2779bcbbc99.tar.bz2 aports-9526ee659401dee7160f35cb62ded2779bcbbc99.tar.xz | |
merged x11 repository into main
ref #255
Diffstat (limited to 'x11/xinit/xinitrc')
| -rw-r--r-- | x11/xinit/xinitrc | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/x11/xinit/xinitrc b/x11/xinit/xinitrc deleted file mode 100644 index 005571359..000000000 --- a/x11/xinit/xinitrc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -xinitdir=/etc/X11 -sysresources=$xinitdir/Xresources -sysmodmap=$xinitdir/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 - -# First try ~/.xinitrc -if [ -f "$HOME/.xinitrc" ]; then - XINITRC="$HOME/.xinitrc" - if [ -x $XINITRC ]; then - # if the x bit is set on .xinitrc - # it means the xinitrc is not a - # shell script but something else - exec $XINITRC "$@" - else - exec /bin/sh "$HOME/.xinitrc" "$@" - fi -fi - -# If not present, try the system default -exec startxfce4 - - -# Fall back to fluxbox -exec startfluxbox - -# Start only terminal as last resort -exec terminal || exec aterm |