Fixed profile sourcing.

master
Pierre Neidhardt 2013-06-04 08:51:17 +02:00
parent e6e6d88957
commit bc84a9e2b8
2 changed files with 11 additions and 8 deletions

View File

@ -5,6 +5,9 @@
################################################################################
## This file is sourced by some DM and should not contain any desktop execution.
## Env vars and general config.
[ -f "$HOME/.profile" ] && . "$HOME/.profile"
## X config (for URxvt, etc.)
[ -f "${HOME}/.Xresources" ] && xrdb -merge "${HOME}/.Xresources"

16
.zshrc
View File

@ -11,16 +11,16 @@ SHELL_CURRENT="$(ps -o command="" $$)"
SHELL_DIR="$HOME/.shell.d"
## Should be sourced first.
. "$HOME/.profile"
. "${SHELL_DIR}/main_rc"
. "${SHELL_DIR}/options_zsh"
[ -f "$HOME/.profile" ] && . "$HOME/.profile"
[ -f "${SHELL_DIR}/main_rc" ] && . "${SHELL_DIR}/main_rc"
[ -f "${SHELL_DIR}/options_zsh" ] && . "${SHELL_DIR}/options_zsh"
## Source order should not matter.
. "${SHELL_DIR}/alias_rc"
. "${SHELL_DIR}/colors_zsh"
. "${SHELL_DIR}/completion_rc"
. "${SHELL_DIR}/funs_rc"
. "${SHELL_DIR}/keys_zsh"
[ -f "${SHELL_DIR}/alias_rc" ] && . "${SHELL_DIR}/alias_rc"
[ -f "${SHELL_DIR}/colors_zsh" ] && . "${SHELL_DIR}/colors_zsh"
[ -f "${SHELL_DIR}/completion_rc" ] && . "${SHELL_DIR}/completion_rc"
[ -f "${SHELL_DIR}/funs_rc" ] && . "${SHELL_DIR}/funs_rc"
[ -f "${SHELL_DIR}/keys_zsh" ] && . "${SHELL_DIR}/keys_zsh"
## Should be sourced last
[ -f "${SHELL_DIR}/hook" ] && . "${SHELL_DIR}/hook"