X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=zshenv;h=5db099ea56db48a4bbccd3d52689addc7f8e95f6;hb=49f54dc98ba5d201bdae8fa18dabfa13bc561679;hp=fc8acbcd73f2aa491281fa425ba4e06f0f68bbcf;hpb=1b0bfb33e57baf684511418a513b2003c46ad26f;p=~madcoder%2Fdotfiles.git

diff --git a/zshenv b/zshenv
index fc8acbc..5db099e 100644
--- a/zshenv
+++ b/zshenv
@@ -10,11 +10,13 @@ function _chose_locale() {
 
     locs=(${(M)${(f)"$(locale -a)"%*.utf8}})
     case $locs in
-        *fr_FR*) loc=fr_FR.utf8;;
-        *fr*)    loc=${${(M)locs:#fr*.utf8}[1]};;
-        *en_US*) loc=en_US.utf8;;
-        *en*)    loc=${${(M)locs:#en*.utf8}[1]};;
-        *)       loc=C;;
+        *fr_FR.UTF-8*) loc=fr_FR.UTF-8;;
+        *fr_FR.utf8*)  loc=fr_FR.utf8;;
+        *fr*)          loc=${${(M)locs:#fr*.utf8}[1]};;
+        *en_US.UTF-8*) loc=en_US.UTF-8;;
+        *en_US.utf8*)  loc=en_US.utf8;;
+        *en*)          loc=${${(M)locs:#en*.utf8}[1]};;
+        *)             loc=C;;
     esac
 
     export LC_CTYPE=${loc:-C}
@@ -34,7 +36,7 @@ function _chose_locale() {
 
 _chose_locale
 
-if test -d ~/dev/scm/git; then
+if test -d ~/dev/scm/git -a -z "$GIT_EXEC_PATH"; then
     export GIT_EXEC_PATH=~/dev/scm/git
     export PATH=~/dev/scm/git:${PATH}
 fi