mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2025-11-04 13:21:19 +08:00 
			
		
		
		
	nvm plugin improvements (#5265)
* Export $NVM_DIR if it doesn't exist and use it when looking for nvm * Use $NVM_DIR when looking for nvm for completion * Use $NVM_DIR when looking for nvm in nvm_prompt_info
This commit is contained in:
		
							parent
							
								
									7654b16b39
								
							
						
					
					
						commit
						a7de0fabd7
					
				@ -1,6 +1,6 @@
 | 
			
		||||
# get the node.js version
 | 
			
		||||
function nvm_prompt_info() {
 | 
			
		||||
  [ -f "$HOME/.nvm/nvm.sh" ] || return
 | 
			
		||||
  [[ -f "$NVM_DIR/nvm.sh" ]] || return
 | 
			
		||||
  local nvm_prompt
 | 
			
		||||
  nvm_prompt=$(node -v 2>/dev/null)
 | 
			
		||||
  [[ "${nvm_prompt}x" == "x" ]] && return
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
#compdef nvm
 | 
			
		||||
#autoload
 | 
			
		||||
 | 
			
		||||
[[ -s ~/.nvm/nvm.sh ]] || return 0
 | 
			
		||||
[[ -f "$NVM_DIR/nvm.sh" ]] || return 0
 | 
			
		||||
 | 
			
		||||
local -a _1st_arguments
 | 
			
		||||
_1st_arguments=(
 | 
			
		||||
 | 
			
		||||
@ -1,3 +1,5 @@
 | 
			
		||||
# The addition 'nvm install' attempts in ~/.profile
 | 
			
		||||
# Set NVM_DIR if it isn't already defined
 | 
			
		||||
[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
 | 
			
		||||
 | 
			
		||||
[[ -s ~/.nvm/nvm.sh ]] && . ~/.nvm/nvm.sh
 | 
			
		||||
# Load nvm if it exists
 | 
			
		||||
[[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user