Merge remote-tracking branch 'cadusk/master'

# Conflicts:
#	templates/zshrc-linux.zsh
#	templates/zshrc-mac.zsh
This commit is contained in:
Gaetan Semet 2016-02-04 14:50:03 +01:00
commit 02e2063325

View file

@ -58,12 +58,12 @@ ZSH_HIGHLIGHT_STYLES[globbing]='none'
zstyle ':completion:*:descriptions' format '%B%d%b'
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
if [ -e $HOME/.local/bin ]; then export PATH="$HOME/.local/bin:$PATH"; fi
if [ -e $HOME/appengine ]; then export PATH="$HOME/appengine:$PATH"; fi
if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
# if [ -e $HOME/.local/bin ]; then export PATH="$HOME/.local/bin:$PATH"; fi
# if [ -e $HOME/appengine ]; then export PATH="$HOME/appengine:$PATH"; fi
# if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
#
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.utf8; fi
if [ -z "$LANG" ]; then export LANG=en_US.utf8; fi
# source .profile is any (proxy settings,...)
[ -f $HOME/.profile ] && source $HOME/.profile