From 0ab876df37075b77342261c38b5f4c70d15924b6 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 24 Aug 2012 00:40:19 +0200 Subject: [PATCH 1/2] merged upstream --- oh-my-zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oh-my-zsh b/oh-my-zsh index b42d44a..c443926 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit b42d44ab8abefea37df6112bd613a07b379598c5 +Subproject commit c443926e28d0b6b527eeb87870f7be7dce7c5b35 From 22a5603976f0b60642ef56f51ed116a2a63de68e Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 29 Aug 2012 23:07:40 +0200 Subject: [PATCH 2/2] change to using a ~/local directory for node modules and executables --- npmrc | 1 + zshrc | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 npmrc diff --git a/npmrc b/npmrc new file mode 100644 index 0000000..73b78c7 --- /dev/null +++ b/npmrc @@ -0,0 +1 @@ +prefix = ~/local diff --git a/zshrc b/zshrc index d039c0d..da3f038 100644 --- a/zshrc +++ b/zshrc @@ -30,14 +30,9 @@ source $ZSH/oh-my-zsh.sh # Customize to your needs... -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ] ; then - PATH="$HOME/bin:$PATH" -fi +# use $HOME/local as default prefix for npm global installs +HOME_LOCAL=$HOME/local -# local node install -NODE_PATH="$HOME/.nave/current" -if [ -d $NODE_PATH ] ; then - PATH="$NODE_PATH/bin:$PATH" - export NODE_PATH +if [ -d "$HOME_LOCAL/bin" ] ; then + PATH="$HOME_LOCAL/bin:$PATH" fi