X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_zshenv;h=08f112e85bab781e2a84b0c8152e7e018be90ab2;hb=0d20b0eb4b881af551fa44d34766eb763982315f;hp=22fb32b13025e1d26aa9b6669567f6a52719fae4;hpb=229d4020187ccf3d9822181ae480564559c30a17;p=sugar.git diff --git a/dot-files/_zshenv b/dot-files/_zshenv index 22fb32b..08f112e 100644 --- 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") @@ -29,11 +29,16 @@ append_path PATH /opt/local/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 $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 @@ -84,8 +89,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 @@ -107,8 +121,13 @@ export CVS_RSH=ssh # sox export AUDIODRIVER=ao +# Amazon EC2 +if [[ -e "$HOME/.ec2/environ.sh" ]]; then + . "$HOME/.ec2/environ.sh" +fi + # icc -if [ -e /opt/intel/cce/latest/bin/iccvars.sh ]; then +if [[ -e /opt/intel/cce/latest/bin/iccvars.sh ]]; then . /opt/intel/cce/latest/bin/iccvars.sh . /opt/intel/ipp/latest/em64t/tools/env/ippvarsem64t.sh fi