]>
Commit | Line | Data |
---|---|---|
51dc2905 JB |
1 | --- gdm-40.0/data/Xsession.in.orig 2021-03-30 15:27:29.673587600 +0200 |
2 | +++ gdm-40.0/data/Xsession.in 2021-04-08 06:33:38.688182706 +0200 | |
3 | @@ -45,6 +45,10 @@ | |
4 | fi | |
0114c544 | 5 | test -f "$HOME/.xprofile" && . "$HOME/.xprofile" |
f6db0bb3 | 6 | |
7 | +if [ ! -f $HOME/.profile ] && echo $SHELL |grep -q "bash"; then | |
8 | + test -f $HOME/.bash_profile && . $HOME/.bash_profile | |
9 | +fi | |
10 | + | |
11 | # Translation stuff | |
51dc2905 JB |
12 | if [ -x "@libexecdir@/gdmtranslate" ] ; then |
13 | gdmtranslate="@libexecdir@/gdmtranslate" | |
14 | @@ -207,12 +211,21 @@ | |
0114c544 | 15 | fi |
16 | fi | |
17 | ||
51dc2905 JB |
18 | -# add ssh-agent if found |
19 | -sshagent="`gdmwhich ssh-agent`" | |
20 | -if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then | |
21 | - command="$sshagent -- $command" | |
22 | -elif [ -z "$sshagent" ] ; then | |
23 | - echo "$0: ssh-agent not found!" | |
0114c544 | 24 | +# Keep in sync with Xclients from xinitrc-ng |
25 | +syswmfile="/etc/sysconfig/desktop" | |
26 | + | |
27 | +# In this file "$wmstyledir" value may be given | |
28 | +[ -f "$syswmfile" ] && . $syswmfile | |
29 | + | |
30 | +if [ -z "$wmstyledir" ]; then | |
31 | + # Keep in sync with Xclients from xinitrc-ng | |
32 | + wmstyledir="/etc/sysconfig/wmstyle" | |
33 | +fi | |
34 | + | |
35 | +if [ -x "$HOME/bin/$command.sh" ]; then | |
36 | + command="$HOME/bin/$command.sh" | |
37 | +elif [ -x "$wmstyledir/$command.sh" ]; then | |
38 | + command="$wmstyledir/$command.sh" | |
51dc2905 | 39 | fi |
b38212cb | 40 | |
51dc2905 | 41 | echo "$0: Setup done, will execute: $command" |