X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=config%2Fzsh%2F20_environment;h=bc2958a7ebc69822262d7c6087ff49972e3566a4;hb=b432593cd0e91f2b0eb9bba5d106b563cd98e916;hp=8dc12cc884ceaf22f39073d14c6313eef8995963;hpb=2af82e92637833473bb7419b34ca7c9b8304dc54;p=~madcoder%2Fdotfiles.git

diff --git a/config/zsh/20_environment b/config/zsh/20_environment
index 8dc12cc..bc2958a 100644
--- a/config/zsh/20_environment
+++ b/config/zsh/20_environment
@@ -24,10 +24,25 @@ export LC_MESSAGES=C
 unset  LC_ALL
 unset  VERBOSE
 
-if [ $UID -eq 0 ]; then
+if [ $(whoami) = root ]; then
     PATH=~root/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH
 else
-    PATH="${HOME}/local/bin:/usr/lib/ccache:${HOME}/bin:${PATH}"
-    LD_LIBRARY_PATH="${HOME}/local/lib"
+    case "${PATH}" in
+        *:${HOME}/local/bin:*)
+            ;;
+        *)
+            PATH="/usr/lib/ccache:${HOME}/local/bin:${HOME}/bin:${PATH}"
+            case $(uname) in
+                Darwin)
+                    ;;
+                *)
+                    LD_LIBRARY_PATH="${HOME}/local/lib"
+                    ;;
+            esac
+            ;;
+    esac
 fi
 
+if test -f /etc/timezone -a -z "$TZ"; then
+    export TZ=$(cat /etc/timezone)
+fi