Merge branch 'master' of github.com:lloeki/dotfiles

Conflicts:
	home/profile
This commit is contained in:
Loic Nageleisen 2012-08-13 15:54:26 +02:00
commit 02b9c5229f
4 changed files with 9 additions and 11 deletions

View file

@ -1,10 +1,5 @@
## bash_profile, called for login shells
# dotfiles locations
DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ${BASH_SOURCE[0]})")" && pwd)"
DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )"
DOTFILES_BASH_DIR="$DOTFILES_ROOT_DIR/bash"
# include .profile
source ~/.profile

View file

@ -5,11 +5,13 @@ source $DOTFILES_BASH_DIR/history
source $DOTFILES_BASH_DIR/term_title
source $DOTFILES_BASH_DIR/completion
# Make bash check its window size after a process completes
shopt -s checkwinsize
# easy on spelling mistakes
shopt -s cdspell
# turn off distractive bells
set bell-style none
# vim: ft=sh

View file

@ -1,5 +1,11 @@
## .profile
# dotfiles locations
DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ~/.profile)")" && pwd)"
DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )"
DOTFILES_ZSH_DIR="$DOTFILES_ROOT_DIR/zsh"
DOTFILES_BASH_DIR="$DOTFILES_ROOT_DIR/bash"
. "$DOTFILES_ROOT_DIR/shell/autoload"
export PATH

View file

@ -1,10 +1,5 @@
# zprofile, called for login shells
# dotfiles locations
DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ~/.zprofile)")" && pwd)"
DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )"
DOTFILES_ZSH_DIR="$DOTFILES_ROOT_DIR/zsh"
emulate sh
source ~/.profile
emulate zsh