]> git.pld-linux.org Git - packages/xorg-app-xdm.git/blob - xorg-app-xdm-Xsession.patch
- updated to 1.1.16
[packages/xorg-app-xdm.git] / xorg-app-xdm-Xsession.patch
1 --- xdm-1.0.3/xdm-xinitrc-0.2/Xsession.orig     2000-11-01 20:06:03.000000000 +0000
2 +++ xdm-1.0.3/xdm-xinitrc-0.2/Xsession  2006-04-03 12:53:54.897645000 +0000
3 @@ -2,19 +2,25 @@
4  # Copyright (c) 1999, 2000 Red Hat, Inc.
5  
6  # redirect errors to a file in user's home directory if we can
7 -for errfile in "${TMPDIR-/tmp}/.xsession-$USER" \
8 -               "/tmp/.xsession-$USER" \
9 -               "$HOME/.xsession-errors"
10 -do
11 -       if cp /dev/null "$errfile" 2> /dev/null ; then
12 -               chmod 600 "$errfile"
13 -               exec > "$errfile" 2>&1
14 -               break
15 -       fi
16 -done
17 +errfile="$HOME/.xsession-errors"
18 +if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
19 +then
20 +       exec > "$errfile" 2>&1
21 +else
22 +
23 +       mktemp=/bin/mktemp
24 +       for errfile in "${TMPDIR-/tmp}/.xsession-$USER" "/tmp/.xsession-$USER"
25 +       do
26 +               if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
27 +               then
28 +                       exec > "$ef" 2>&1
29 +                       mv "$ef" "$errfile" 2> /dev/null
30 +                       break
31 +               fi
32 +       done
33 +fi
34  
35 -[ "`echo $PATH | grep -q /usr/X11R6/bin`" = "" ] && PATH="${PATH}:/usr/X11R6/bin"
36 -[ "`echo $PATH | grep -q "$HOME/bin"`" = "" ] && PATH="$PATH:$HOME/bin"
37 +[ "`echo $PATH | grep "$HOME/bin" 2>/dev/null`" = "" ] && PATH="$PATH:$HOME/bin"
38  
39  userresources=$HOME/.Xresources
40  usermodmap=$HOME/.Xmodmap
This page took 0.101342 seconds and 3 git commands to generate.