Attachment 104946 Details for Bug 135071 – diff between old version (first) and current version of xinintrc

diff between old version (first) and current version of xinintrc

diff_xinintrc.txt (text/plain), 2.86 KB, created by Mickey Stein on 2004-10-08 16:13:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mickey Stein

Created: 2004-10-08 16:13:24 UTC

Size: 2.86 KB

patch

obsolete

>--- /etc/X11/xinit/xinitrc	2004-10-07 22:18:47.000000000 -0700
>+++ /etc/X11/xinit/xinitrc.new	2004-10-07 22:17:27.000000000 -0700
>@@ -8,87 +8,25 @@
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> 
>-userresources=$HOME/.Xresources
>-usermodmap=$HOME/.Xmodmap
>-userxkbmap=$HOME/.Xkbmap
>-
>-sysresources=/etc/X11/Xresources
>-sysmodmap=/etc/X11/Xmodmap
>-sysxkbmap=/etc/X11/Xkbmap
>-
>-# merge in defaults
>-if [ -f "$sysresources" ]; then
>-    xrdb -merge "$sysresources"
>-fi
>-
>-if [ -f "$userresources" ]; then
>-    xrdb -merge "$userresources"
>-fi
>-
>-# merge in keymaps
>-if [ -f "$sysxkbmap" ]; then
>-    setxkbmap `cat "$sysxkbmap"`
>-    XKB_IN_USE=yes
>-fi
>-
>-if [ -f "$userxkbmap" ]; then
>-    setxkbmap `cat "$userxkbmap"`
>-    XKB_IN_USE=yes
>-fi
>-
>-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
>-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
>-	xkbsymbols=`sed -n -e 's/^[ 	]*XkbSymbols[ 	]*"$.*$".*$/\1/p' /etc/X11/XF86Config`
>-	if [ -n "$xkbsymbols" ]; then
>-	    setxkbmap -symbols "$xkbsymbols"
>-	    XKB_IN_USE=yes
>-	fi
>-    fi
>-fi
>-
>-# xkb and xmodmap don't play nice together
>-if [ -z "$XKB_IN_USE" ]; then
>-    if [ -f "$sysmodmap" ]; then
>-	xmodmap "$sysmodmap"
>-    fi
>-
>-    if [ -f "$usermodmap" ]; then
>-	xmodmap "$usermodmap"
>-    fi
>-fi
>-
>-unset XKB_IN_USE
>-
>-# run all system xinitrc shell scripts.
>-for i in /etc/X11/xinit/xinitrc.d/* ; do
>-    if [ -x "$i" ]; then
>-	. "$i"
>-    fi
>-done
>+# Mandatorily source xinitrc-common, which is common code shared between the
>+# Xsession and xinitrc scripts which has been factored out to avoid duplication
>+. /etc/X11/xinit/xinitrc-common
> 
> # The user may have their own clients they want to run.  If they don't,
> # fall back to system defaults.
>-# set up ssh agent environment if available.
>-
> if [ -f $HOME/.Xclients ]; then
>-    [ -x /usr/bin/ssh-agent -a -z "$SSH_AGENT_PID" ] && \
>-	exec ssh-agent $HOME/.Xclients || \
>-	exec $HOME/.Xclients
>+	exec $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients || \
>+	exec $DBUS_LAUNCH $HOME/.Xclients
> elif [ -f /etc/X11/xinit/Xclients ]; then
>-    [ -x /usr/bin/ssh-agent -a -z "$SSH_AGENT_PID" ] && \
>-	exec ssh-agent /etc/X11/xinit/Xclients || \
>+	exec $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients || \
> 	exec /etc/X11/xinit/Xclients
> else
>        # failsafe settings.  Although we should never get here
>        # (we provide fallbacks in Xclients as well) it can't hurt.
>        xclock -geometry 100x100-5+5 &
>        xterm -geometry 80x50-50+150 &
>-       if [ -x /usr/bin/netscape -a -f /usr/share/doc/HTML/index.html ]; then
>-               netscape /usr/share/doc/HTML/index.html &
>-       fi
>-       if [ -x /usr/X11R6/bin/fvwm2 ]; then
>-               exec fvwm2
>-       else
>-               exec twm
>+
>+       if [ -x /usr/X11R6/bin/twm ]; then
>+               exec /usr/X11R6/bin/twm
>        fi
> fi

Actions: View

Attachments on bug 135071: 104946