Skip to content

Commit 090d380

Browse files
committed
Work around long-standing annoying nvm bug
It only shows up on one machine, where I have /home symlinked to a different mount point. nvm-sh/nvm#855 nvm-sh/nvm#1087 nvm-sh/nvm#1224 nvm-sh/nvm#1245 http://stackoverflow.com/questions/34718528/nvm-is-not-compatible-with-the-npm-config-prefix-option
1 parent dc31606 commit 090d380

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

zsh.d/01-env

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
# Move these from zshenv because /etc/zprofile will overwrite.
22
PATH=/usr/local/bin:/usr/local/sbin:$PATH
3-
if [[ -d $HOME/.rbenv ]]; then
4-
PATH=$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH
3+
if [[ -d ${HOME_}/.rbenv ]]; then
4+
PATH=${HOME_}/.rbenv/bin:${HOME_}/.rbenv/shims:$PATH
55
rbenv init - >/tmp/rbenvinit.zsh; source /tmp/rbenvinit.zsh
66
fi
77

8-
[[ -d $HOME/.cabal ]] && PATH=$HOME/.cabal/bin:$PATH
9-
[[ -d $HOME/.local ]] && PATH=$HOME/.local/bin:$PATH
10-
[[ -d $HOME/.cargo ]] && PATH=$HOME/.cargo/bin:$PATH
11-
[[ -d $HOME/.nix-profile ]] && . $HOME/.nix-profile/etc/profile.d/nix.sh
12-
[[ -d $HOME/.nvm ]] && . $HOME/.nvm/nvm.sh
13-
[[ -d $HOME/perl5 ]] && . $HOME/perl5/perlbrew/etc/bashrc
8+
[[ -d ${HOME_}/.cabal ]] && PATH=${HOME_}/.cabal/bin:$PATH
9+
[[ -d ${HOME_}/.local ]] && PATH=${HOME_}/.local/bin:$PATH
10+
[[ -d ${HOME_}/.cargo ]] && PATH=${HOME_}/.cargo/bin:$PATH
11+
[[ -d ${HOME_}/.nix-profile ]] && . ${HOME_}/.nix-profile/etc/profile.d/nix.sh
1412

15-
CLOJURESCRIPT_HOME=$HOME/src/clojurescript; export CLOJURESCRIPT_HOME
13+
NVM_DIR=${HOME_}/.nvm
14+
[[ -d ${HOME_}/.nvm ]] && source ${HOME_}/.nvm/nvm.sh
15+
[[ -d ${HOME_}/perl5 ]] && . ${HOME_}/perl5/perlbrew/etc/bashrc
16+
17+
CLOJURESCRIPT_HOME=${HOME_}/src/clojurescript; export CLOJURESCRIPT_HOME
1618
[[ -d $CLOJURESCRIPT_HOME ]] && PATH=$CLOJURESCRIPT_HOME/bin:$PATH
1719

18-
GOROOT=$HOME/src/go; export GOROOT
20+
GOROOT=${HOME_}/src/go; export GOROOT
1921
[[ -d $GOROOT ]] && PATH=$GOROOT/bin:$PATH
20-
GOPATH=$HOME/src/golib; export GOPATH
22+
GOPATH=${HOME_}/src/golib; export GOPATH
2123
[[ -d $GOPATH ]] && PATH=$GOPATH/bin:$PATH
2224

23-
PATH=$HOME/bin:$PATH
25+
PATH=${HOME_}/bin:$PATH
2426

2527
if [[ $TERM == "dumb" ]]; then
2628
## To help with the ^[[?2004h business in emacs-shell

zshenv

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
[[ -o interactive ]] && echo "+++Reading .zshenv"
22

3+
HOME_=$(readlink $(dirname $HOME))
4+
if [[ -z $HOME_ ]]; then
5+
HOME_=$HOME
6+
else
7+
HOME_=${HOME_}/$USER
8+
fi
9+
310
OS=$(uname -s); export OS
411
MANPATH=/opt/local/man:/usr/local/man:$MANPATH
512
WORDCHARS='*?_[]~=&;!#$%^(){}'
613
WORDCHARS=${WORDCHARS:s,/,,}
7-
LEDGER_FILE=$HOME/.ledger; export LEDGER_FILE
14+
LEDGER_FILE=${HOME_}/.ledger; export LEDGER_FILE
815
EDITOR=vi; export EDITOR
916
EMAIL="andrew@raines.me"; export EMAIL
1017
FULLNAME="Andrew Raines"; export FULLNAME
18+

0 commit comments

Comments
 (0)