Auto commit by The Sugar System.

[sugar.git] / dot-files / _zshenv

diff --git a/dot-files/_zshenv b/dot-files/_zshenv
index 12c215bd81a4927fdebce5cd5dff13af22338913..713c80869dad9ba3d5074f2ec4b408a450cb740d 100644 (file)
--- a/dot-files/_zshenv
+++ b/dot-files/_zshenv
@@ -4,10 +4,10 @@ function append_path {
     local _varname="$1"
     local _path="$2"
 
-    if [ -d "$_path" ]; then
+    if [[ -d "$_path" ]]; then
         local _var=$(eval echo $(printf '$%s' "$_varname"))
 
-         if [ "$_var" = "" ]; then
+        if [[ "$_var" = "" ]]; then
             eval $(printf 'export %s="%s"' "$_varname" "$_path")
         else
             eval $(printf 'export %s="%s:$%s"' "$_varname" "$_path" "$_varname")
@@ -26,17 +26,22 @@ append_path PATH /usr/local/sbin
 append_path PATH /usr/local/cross/bin
 append_path PATH /opt/local/bin
 append_path PATH /opt/local/sbin
+append_path PATH /opt/pkg/bin
+append_path PATH /opt/pkg/sbin
 append_path PATH /usr/pkg/bin
 append_path PATH /usr/pkg/sbin
 append_path PATH /usr/pkg/lib/perl5/site_perl/bin
 append_path PATH /usr/pkg/java/openjdk7/bin
 append_path PATH /usr/local/java-1.7.0/bin
 append_path PATH /usr/local/sbt/bin
+append_path PATH /usr/X11R7/bin
 append_path PATH $HOME/bin
+append_path PATH $HOME/sandbox/_phabricator/arcanist/bin
 # Hope these could be removed someday!
 append_path PATH /usr/local/ymir/erlang/bin
 append_path PATH /usr/local/ymir/mercurial/bin
 append_path PATH /usr/local/ymir/mongodb/bin
+append_path PATH /usr/local/ymir/nodejs/bin
 append_path PATH /usr/local/ymir/perl/bin
 append_path PATH /usr/local/ymir/postgresql90/bin
 
@@ -47,7 +52,9 @@ append_path MANPATH /usr/local/man
 append_path MANPATH /usr/local/cross/share/man
 append_path MANPATH /usr/local/share/man
 append_path MANPATH /opt/local/share/man
+append_path MANPATH /opt/pkg/man
 append_path MANPATH /usr/pkg/man
+append_path MANPATH /usr/X11R7/man
 
 # INFOPATH
 export INFOPATH=""
@@ -56,6 +63,7 @@ append_path INFOPATH /usr/local/info
 append_path INFOPATH /usr/local/share/info
 append_path INFOPATH /usr/local/cross/share/info
 append_path INFOPATH /opt/local/share/info
+append_path INFOPATH /opt/pkg/info
 append_path INFOPATH /usr/pkg/info
 
 # PKG_CONFIG_PATH
@@ -64,6 +72,7 @@ append_path PKG_CONFIG_PATH /usr/lib/pkgconfig
 append_path PKG_CONFIG_PATH /usr/local/lib/pkgconfig
 append_path PKG_CONFIG_PATH /usr/local/cross/lib/pkgconfig
 append_path PKG_CONFIG_PATH /opt/local/lib/pkgconfig
+append_path PKG_CONFIG_PATH /opt/pkg/lib/pkgconfig
 append_path PKG_CONFIG_PATH /usr/pkg/lib/pkgconfig
 
 # TMPDIR (Only for Darwin)
@@ -87,8 +96,17 @@ export OUTPUT_CHARSET="UTF-8"
 export EDITOR="vim"
 export PAGER="less"
 
+# pkgsrc
+export NETBSD_LOGIN_NAME=pho
+if [[ $(hostname) = "nem.cielonegro.org" ]]; then
+    export PKG_DBDIR=/usr/pkgdb
+fi
+
 # GUI Toolkits
 export SDL_VIDEODRIVER="x11"
+if [[ $(uname) = "Darwin" ]]; then
+    export GGI_DISPLAY=x:-noshm
+fi
 
 # Input Methods
 export UIM_FEP=skk