mirror of
https://github.com/tedkulp/dotfiles
synced 2026-04-18 21:54:46 -04:00
Changes
This commit is contained in:
@@ -0,0 +1 @@
|
||||
alias strip-ansi="perl -pe 's/\e\[[0-9;]*m(?:\e\[K)?//g'"
|
||||
+38
-23
@@ -1,29 +1,44 @@
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
# These are the ones when using curl install
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
|
||||
[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||
|
||||
# These are the homebrew ones
|
||||
[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # This loads nvm
|
||||
[ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion
|
||||
declare -a NODE_GLOBALS=(`find $NVM_DIR/versions/node -maxdepth 3 -type l -wholename '*/bin/*' | xargs -n1 basename | sort | uniq`)
|
||||
|
||||
autoload -U add-zsh-hook
|
||||
load-nvmrc() {
|
||||
local node_version="$(nvm version)"
|
||||
local nvmrc_path="$(nvm_find_nvmrc)"
|
||||
NODE_GLOBALS+=("node")
|
||||
NODE_GLOBALS+=("nvm")
|
||||
|
||||
if [ -n "$nvmrc_path" ]; then
|
||||
local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
|
||||
|
||||
if [ "$nvmrc_node_version" = "N/A" ]; then
|
||||
nvm install
|
||||
elif [ "$nvmrc_node_version" != "$node_version" ]; then
|
||||
nvm use
|
||||
fi
|
||||
elif [ "$node_version" != "$(nvm version default)" ]; then
|
||||
echo "Reverting to nvm default version"
|
||||
nvm use default
|
||||
load_nvm () {
|
||||
if [ -s "$NVM_DIR/nvm.sh" ]; then
|
||||
# These are the ones when using curl install
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
|
||||
[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||
elif [ -x "$(command -v brew)" ]; then
|
||||
export NVM_PREFIX=$(brew --prefix nvm)
|
||||
# These are the homebrew ones
|
||||
[ -s "$NVM_PREFIX/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # This loads nvm
|
||||
[ -s "$NVM_PREFIX/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion
|
||||
fi
|
||||
}
|
||||
add-zsh-hook chpwd load-nvmrc
|
||||
load-nvmrc
|
||||
|
||||
for cmd in "${NODE_GLOBALS[@]}"; do
|
||||
eval "${cmd}(){ unset -f ${NODE_GLOBALS}; load_nvm; ${cmd} \$@ }"
|
||||
done
|
||||
|
||||
# autoload -U add-zsh-hook
|
||||
# load-nvmrc() {
|
||||
# local node_version="$(nvm version)"
|
||||
# local nvmrc_path="$(nvm_find_nvmrc)"
|
||||
|
||||
# if [ -n "$nvmrc_path" ]; then
|
||||
# local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
|
||||
|
||||
# if [ "$nvmrc_node_version" = "N/A" ]; then
|
||||
# nvm install
|
||||
# elif [ "$nvmrc_node_version" != "$node_version" ]; then
|
||||
# nvm use
|
||||
# fi
|
||||
# elif [ "$node_version" != "$(nvm version default)" ]; then
|
||||
# echo "Reverting to nvm default version"
|
||||
# nvm use default
|
||||
# fi
|
||||
# }
|
||||
# add-zsh-hook chpwd load-nvmrc
|
||||
# load-nvmrc
|
||||
|
||||
Reference in New Issue
Block a user