|
Lines 10-15
Link Here
|
| 10 |
esac |
10 |
esac |
| 11 |
esac |
11 |
esac |
| 12 |
|
12 |
|
|
|
13 |
if [ -n "$*" ]; then |
| 14 |
export XSESSION="$*" |
| 15 |
fi |
| 16 |
|
| 13 |
# redirect errors to a file in user's home directory if we can |
17 |
# redirect errors to a file in user's home directory if we can |
| 14 |
for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" |
18 |
for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" |
| 15 |
do |
19 |
do |
|
Lines 94-100
Link Here
|
| 94 |
|
98 |
|
| 95 |
unset XKB_IN_USE |
99 |
unset XKB_IN_USE |
| 96 |
|
100 |
|
| 97 |
if [ -x "$startup" ]; then |
101 |
if [ -n "`/etc/X11/chooser.sh`" ]; then |
|
|
102 |
command="`/etc/X11/chooser.sh`" |
| 103 |
fi |
| 104 |
|
| 105 |
if [ -d /etc/X11/xinit/xinitrc.d ]; then |
| 106 |
for f in /etc/X11/xinit/xinitrc.d/?* ; do |
| 107 |
[ -x "$f" ] && . "$f" |
| 108 |
done |
| 109 |
unset f |
| 110 |
fi |
| 111 |
|
| 112 |
if [ -n "$command" ]; then |
| 113 |
exec $command |
| 114 |
elif [ -x "$startup" ]; then |
| 98 |
exec "$startup" |
115 |
exec "$startup" |
| 99 |
elif [ -x "$HOME/.Xclients" ]; then |
116 |
elif [ -x "$HOME/.Xclients" ]; then |
| 100 |
exec "$HOME/.Xclients" |
117 |
exec "$HOME/.Xclients" |
