From e72f7d8b559b2a9c9a1c4556b5bb19e4411f128c Mon Sep 17 00:00:00 2001 From: havner Date: Fri, 9 Jul 2004 13:22:42 +0000 Subject: [PATCH] - use wmstyledir just like xinitrc-ng does Changed files: gdm-xsession.patch -> 1.2 --- gdm-xsession.patch | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/gdm-xsession.patch b/gdm-xsession.patch index 36f866c..a5447ca 100644 --- a/gdm-xsession.patch +++ b/gdm-xsession.patch @@ -1,9 +1,9 @@ -diff -urN gdm.orig/config/Xsession.in gdm-2.4.4.1/config/Xsession.in ---- gdm.orig/config/Xsession.in 2003-08-18 19:31:08.000000000 +0200 -+++ gdm-2.4.4.1/config/Xsession.in 2003-09-19 23:59:30.802517128 +0200 +diff -urN gdm-2.6.0.3.orig/config/Xsession.in gdm-2.6.0.3/config/Xsession.in +--- gdm-2.6.0.3.orig/config/Xsession.in 2004-05-28 21:50:17.000000000 +0200 ++++ gdm-2.6.0.3/config/Xsession.in 2004-07-09 15:07:16.039478016 +0200 @@ -35,6 +35,10 @@ test -f /etc/xprofile && . /etc/xprofile - test -f $HOME/.xprofile && . $HOME/.xprofile + test -f "$HOME/.xprofile" && . "$HOME/.xprofile" +if [ ! -f $HOME/.profile ] && echo $SHELL |grep -q "bash"; then + test -f $HOME/.bash_profile && . $HOME/.bash_profile @@ -12,3 +12,27 @@ diff -urN gdm.orig/config/Xsession.in gdm-2.4.4.1/config/Xsession.in # Translation stuff if [ -x "@EXPANDED_LIBEXECDIR@/gdmtranslate" ] ; then gdmtranslate="@EXPANDED_LIBEXECDIR@/gdmtranslate" +@@ -222,6 +226,23 @@ + fi + fi + ++# Keep in sync with Xclients from xinitrc-ng ++syswmfile="/etc/sysconfig/desktop" ++ ++# In this file "$wmstyledir" value may be given ++[ -f "$syswmfile" ] && . $syswmfile ++ ++if [ -z "$wmstyledir" ]; then ++ # Keep in sync with Xclients from xinitrc-ng ++ wmstyledir="/etc/sysconfig/wmstyle" ++fi ++ ++if [ -x "$HOME/bin/$command.sh" ]; then ++ command="$HOME/bin/$command.sh" ++elif [ -x "$wmstyledir/$command.sh" ]; then ++ command="$wmstyledir/$command.sh" ++fi ++ + # add ssh-agent if found + sshagent="`gdmwhich ssh-agent`" + if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then -- 2.44.0