xinit: source Shell environment settings when a login manager is used.

master
Pierre Neidhardt 2013-04-27 16:35:45 +02:00
parent 719998eb16
commit e18ded2468
2 changed files with 6 additions and 4 deletions

View File

@ -24,7 +24,7 @@ if [ -d "${TEXDIR}" ]; then
if [ -d "${TEXFOLDER}" ]; then
export PATH=${TEXFOLDER}:$PATH
export INFOPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/info:$INFOPATH
## BSD uses 'manpath' utility, so MANPATH variable may be empty.
if [ "$OSTYPE" = "linux-gnu" ]; then
export MANPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/man:$MANPATH
@ -52,7 +52,7 @@ export TERMCMD="urxvt"
## WARNING: this is always a bad idea!
## FreeBSD urxvt $TERM variable is not set properly for some reasons.
## TODO: check how to do this properly.
if [ ! "$OSTYPE" = "linux-gnu" ] && [[ "$TERM" = *rxvt* ]]; then
if [ ! "$OSTYPE" = "linux-gnu" ] && [[ "$TERM" = *rxvt* ]]; then
export TERM="rxvt-unicode-256color"
fi
@ -84,7 +84,7 @@ fi
if [ -n "$(command -v emacs)" ]; then
EDITOR='emacs'
fi
## 'em' is a script for emacsclient. See '.homeinit'.
## 'em' is a script for emacsclient. See 'homeinit'.
if [ -f "/bin/em" ]; then
EDITOR='em'
fi
@ -116,4 +116,3 @@ else
SSH_AUTH_SOCK=$(sed -n '1{p;q}' "/tmp/ssh-agent-env") ; export SSH_AUTH_SOCK
SSH_AGENT_PID=$(sed -n '2{p;q}' "/tmp/ssh-agent-env") 2>/dev/null ; export SSH_AGENT_PID
fi

View File

@ -15,6 +15,9 @@ numlockx on
udiskie &
fi
## Environment
[ -f ~/.shell.d/main_rc ] && . ~/.shell.d/main_rc
##==============================================================================
## Launch session
##==============================================================================