X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_zshenv;h=acbbde18c8c840801aa10d96ae6ffd2e01943ef5;hb=178ef467454283740e5870b68a1cecdcf0ad8a5b;hp=a957e2b6d8bd1f812053dcad96408393c241c874;hpb=d1ad31f9af99878e85b4106a96ca2b2fc96a7750;p=sugar.git diff --git a/dot-files/_zshenv b/dot-files/_zshenv index a957e2b..acbbde1 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") @@ -26,6 +26,8 @@ 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 @@ -33,10 +35,12 @@ 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 @@ -47,6 +51,7 @@ 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 # INFOPATH @@ -56,6 +61,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 +70,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) @@ -88,12 +95,16 @@ 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