mirror of
				https://github.com/nvm-sh/nvm.git
				synced 2025-10-31 10:15:53 +08:00 
			
		
		
		
	Proper quoting and $(…) vs ….
				
					
				
			This commit is contained in:
		
							
								
								
									
										44
									
								
								nvm.sh
									
									
									
									
									
								
							
							
						
						
									
										44
									
								
								nvm.sh
									
									
									
									
									
								
							| @@ -277,7 +277,7 @@ nvm_ls_current() { | |||||||
|     echo 'none' |     echo 'none' | ||||||
|   elif nvm_tree_contains_path "$NVM_DIR" "$NVM_LS_CURRENT_NODE_PATH"; then |   elif nvm_tree_contains_path "$NVM_DIR" "$NVM_LS_CURRENT_NODE_PATH"; then | ||||||
|     local VERSION |     local VERSION | ||||||
|     VERSION=`node -v 2>/dev/null` |     VERSION="$(node -v 2>/dev/null)" | ||||||
|     if [ "$VERSION" = "v0.6.21-pre" ]; then |     if [ "$VERSION" = "v0.6.21-pre" ]; then | ||||||
|       echo "v0.6.21" |       echo "v0.6.21" | ||||||
|     else |     else | ||||||
| @@ -763,8 +763,8 @@ nvm() { | |||||||
|     ;; |     ;; | ||||||
|     "uninstall" ) |     "uninstall" ) | ||||||
|       [ $# -ne 2 ] && nvm help && return |       [ $# -ne 2 ] && nvm help && return | ||||||
|       PATTERN=`nvm_ensure_version_prefix $2` |       PATTERN="$(nvm_ensure_version_prefix "$2")" | ||||||
|       if [ "$PATTERN" = `nvm_version` ]; then |       if [ "_$PATTERN" = "_$(nvm_version)" ]; then | ||||||
|         echo "nvm: Cannot uninstall currently-active node version, $PATTERN." >&2 |         echo "nvm: Cannot uninstall currently-active node version, $PATTERN." >&2 | ||||||
|         return 1 |         return 1 | ||||||
|       fi |       fi | ||||||
| @@ -790,14 +790,14 @@ nvm() { | |||||||
|       # Rm any aliases that point to uninstalled version. |       # Rm any aliases that point to uninstalled version. | ||||||
|       for ALIAS in `command grep -l $VERSION $NVM_DIR/alias/* 2>/dev/null` |       for ALIAS in `command grep -l $VERSION $NVM_DIR/alias/* 2>/dev/null` | ||||||
|       do |       do | ||||||
|         nvm unalias `basename $ALIAS` |         nvm unalias "$(command basename "$ALIAS")" | ||||||
|       done |       done | ||||||
|  |  | ||||||
|     ;; |     ;; | ||||||
|     "deactivate" ) |     "deactivate" ) | ||||||
|       local NEWPATH |       local NEWPATH | ||||||
|       NEWPATH="$(nvm_strip_path "$PATH" "/bin")" |       NEWPATH="$(nvm_strip_path "$PATH" "/bin")" | ||||||
|       if [ "$PATH" = "$NEWPATH" ]; then |       if [ "_$PATH" = "_$NEWPATH" ]; then | ||||||
|         echo "Could not find $NVM_DIR/*/bin in \$PATH" >&2 |         echo "Could not find $NVM_DIR/*/bin in \$PATH" >&2 | ||||||
|       else |       else | ||||||
|         export PATH="$NEWPATH" |         export PATH="$NEWPATH" | ||||||
| @@ -806,7 +806,7 @@ nvm() { | |||||||
|       fi |       fi | ||||||
|  |  | ||||||
|       NEWPATH="$(nvm_strip_path "$MANPATH" "/share/man")" |       NEWPATH="$(nvm_strip_path "$MANPATH" "/share/man")" | ||||||
|       if [ "$MANPATH" = "$NEWPATH" ]; then |       if [ "_$MANPATH" = "_$NEWPATH" ]; then | ||||||
|         echo "Could not find $NVM_DIR/*/share/man in \$MANPATH" >&2 |         echo "Could not find $NVM_DIR/*/share/man in \$MANPATH" >&2 | ||||||
|       else |       else | ||||||
|         export MANPATH="$NEWPATH" |         export MANPATH="$NEWPATH" | ||||||
| @@ -814,7 +814,7 @@ nvm() { | |||||||
|       fi |       fi | ||||||
|  |  | ||||||
|       NEWPATH="$(nvm_strip_path "$NODE_PATH" "/lib/node_modules")" |       NEWPATH="$(nvm_strip_path "$NODE_PATH" "/lib/node_modules")" | ||||||
|       if [ "$NODE_PATH" != "$NEWPATH" ]; then |       if [ "_$NODE_PATH" != "_$NEWPATH" ]; then | ||||||
|         export NODE_PATH="$NEWPATH" |         export NODE_PATH="$NEWPATH" | ||||||
|         echo "$NVM_DIR/*/lib/node_modules removed from \$NODE_PATH" |         echo "$NVM_DIR/*/lib/node_modules removed from \$NODE_PATH" | ||||||
|       fi |       fi | ||||||
| @@ -827,7 +827,7 @@ nvm() { | |||||||
|       if [ $# -eq 1 ]; then |       if [ $# -eq 1 ]; then | ||||||
|         nvm_rc_version |         nvm_rc_version | ||||||
|         if [ -n "$NVM_RC_VERSION" ]; then |         if [ -n "$NVM_RC_VERSION" ]; then | ||||||
|           VERSION=`nvm_version $NVM_RC_VERSION` |           VERSION="$(nvm_version "$NVM_RC_VERSION")" | ||||||
|         fi |         fi | ||||||
|       elif [ "_$2" != '_system' ]; then |       elif [ "_$2" != '_system' ]; then | ||||||
|         VERSION="$(nvm_version "$2")" |         VERSION="$(nvm_version "$2")" | ||||||
| @@ -859,17 +859,17 @@ nvm() { | |||||||
|         return 1 |         return 1 | ||||||
|       fi |       fi | ||||||
|       # Strip other version from PATH |       # Strip other version from PATH | ||||||
|       PATH=`nvm_strip_path "$PATH" "/bin"` |       PATH="$(nvm_strip_path "$PATH" "/bin")" | ||||||
|       # Prepend current version |       # Prepend current version | ||||||
|       PATH=`nvm_prepend_path "$PATH" "$NVM_VERSION_DIR/bin"` |       PATH="$(nvm_prepend_path "$PATH" "$NVM_VERSION_DIR/bin")" | ||||||
|       if nvm_has manpath; then |       if nvm_has manpath; then | ||||||
|         if [ -z "$MANPATH" ]; then |         if [ -z "$MANPATH" ]; then | ||||||
|           MANPATH=$(manpath) |           MANPATH=$(manpath) | ||||||
|         fi |         fi | ||||||
|         # Strip other version from MANPATH |         # Strip other version from MANPATH | ||||||
|         MANPATH=`nvm_strip_path "$MANPATH" "/share/man"` |         MANPATH="$(nvm_strip_path "$MANPATH" "/share/man")" | ||||||
|         # Prepend current version |         # Prepend current version | ||||||
|         MANPATH=`nvm_prepend_path "$MANPATH" "$NVM_VERSION_DIR/share/man"` |         MANPATH="$(nvm_prepend_path "$MANPATH" "$NVM_VERSION_DIR/share/man")" | ||||||
|         export MANPATH |         export MANPATH | ||||||
|       fi |       fi | ||||||
|       export PATH |       export PATH | ||||||
| @@ -890,7 +890,7 @@ nvm() { | |||||||
|       if [ $# -lt 1 ]; then |       if [ $# -lt 1 ]; then | ||||||
|         nvm_rc_version && has_checked_nvmrc=1 |         nvm_rc_version && has_checked_nvmrc=1 | ||||||
|         if [ -n "$NVM_RC_VERSION" ]; then |         if [ -n "$NVM_RC_VERSION" ]; then | ||||||
|           VERSION=`nvm_version $NVM_RC_VERSION` |           VERSION="$(nvm_version "$NVM_RC_VERSION")" | ||||||
|         else |         else | ||||||
|           VERSION='N/A' |           VERSION='N/A' | ||||||
|         fi |         fi | ||||||
| @@ -902,13 +902,13 @@ nvm() { | |||||||
|  |  | ||||||
|       provided_version=$1 |       provided_version=$1 | ||||||
|       if [ -n "$provided_version" ]; then |       if [ -n "$provided_version" ]; then | ||||||
|         VERSION=`nvm_version $provided_version` |         VERSION="$(nvm_version "$provided_version")" | ||||||
|         if [ "_$VERSION" = "_N/A" ]; then |         if [ "_$VERSION" = "_N/A" ]; then | ||||||
|           provided_version='' |           provided_version='' | ||||||
|           if [ $has_checked_nvmrc -ne 1 ]; then |           if [ $has_checked_nvmrc -ne 1 ]; then | ||||||
|             nvm_rc_version && has_checked_nvmrc=1 |             nvm_rc_version && has_checked_nvmrc=1 | ||||||
|           fi |           fi | ||||||
|           VERSION=`nvm_version $NVM_RC_VERSION` |           VERSION="$(nvm_version "$NVM_RC_VERSION")" | ||||||
|         else |         else | ||||||
|           shift |           shift | ||||||
|         fi |         fi | ||||||
| @@ -930,8 +930,8 @@ nvm() { | |||||||
|       local provided_version |       local provided_version | ||||||
|       provided_version="$1" |       provided_version="$1" | ||||||
|       if [ -n "$provided_version" ]; then |       if [ -n "$provided_version" ]; then | ||||||
|         VERSION=`nvm_version $provided_version` |         VERSION="$(nvm_version "$provided_version")" | ||||||
|         if [ $VERSION = "N/A" ]; then |         if [ "_$VERSION" = "_N/A" ]; then | ||||||
|           provided_version='' |           provided_version='' | ||||||
|           nvm_rc_version |           nvm_rc_version | ||||||
|           VERSION="$(nvm_version "$NVM_RC_VERSION")" |           VERSION="$(nvm_version "$NVM_RC_VERSION")" | ||||||
| @@ -941,13 +941,13 @@ nvm() { | |||||||
|       fi |       fi | ||||||
|  |  | ||||||
|       local NVM_VERSION_DIR |       local NVM_VERSION_DIR | ||||||
|       NVM_VERSION_DIR=$(nvm_version_path "$VERSION") |       NVM_VERSION_DIR="$(nvm_version_path "$VERSION")" | ||||||
|       if [ ! -d "$NVM_VERSION_DIR" ]; then |       if [ ! -d "$NVM_VERSION_DIR" ]; then | ||||||
|         echo "$VERSION version is not installed yet" >&2 |         echo "$VERSION version is not installed yet" >&2 | ||||||
|         return 1 |         return 1 | ||||||
|       fi |       fi | ||||||
|       echo "Running node $VERSION" |       echo "Running node $VERSION" | ||||||
|       NODE_VERSION=$VERSION $NVM_DIR/nvm-exec "$@" |       NODE_VERSION="$VERSION" $NVM_DIR/nvm-exec "$@" | ||||||
|     ;; |     ;; | ||||||
|     "ls" | "list" ) |     "ls" | "list" ) | ||||||
|       local NVM_LS_OUTPUT |       local NVM_LS_OUTPUT | ||||||
| @@ -974,7 +974,7 @@ nvm() { | |||||||
|       if [ $# -eq 1 ]; then |       if [ $# -eq 1 ]; then | ||||||
|         nvm_rc_version |         nvm_rc_version | ||||||
|         if [ -n "$NVM_RC_VERSION" ]; then |         if [ -n "$NVM_RC_VERSION" ]; then | ||||||
|           VERSION=$(nvm_version $NVM_RC_VERSION) |           VERSION=$(nvm_version "$NVM_RC_VERSION") | ||||||
|         fi |         fi | ||||||
|       elif [ "_$2" != '_system' ]; then |       elif [ "_$2" != '_system' ]; then | ||||||
|         VERSION="$(nvm_version "$2")" |         VERSION="$(nvm_version "$2")" | ||||||
| @@ -1075,13 +1075,13 @@ nvm() { | |||||||
|       local PROVIDED_VERSION |       local PROVIDED_VERSION | ||||||
|       PROVIDED_VERSION="$2" |       PROVIDED_VERSION="$2" | ||||||
|  |  | ||||||
|       if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version $PROVIDED_VERSION)" = "$(nvm_ls_current)" ]; then |       if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version "$PROVIDED_VERSION")" = "$(nvm_ls_current)" ]; then | ||||||
|         echo 'Can not reinstall packages from the current version of node.' >&2 |         echo 'Can not reinstall packages from the current version of node.' >&2 | ||||||
|         return 2 |         return 2 | ||||||
|       fi |       fi | ||||||
|  |  | ||||||
|       local INSTALLS |       local INSTALLS | ||||||
|       if [ "$PROVIDED_VERSION" = "system" ]; then |       if [ "_$PROVIDED_VERSION" = "_system" ]; then | ||||||
|         if ! nvm_has_system_node; then |         if ! nvm_has_system_node; then | ||||||
|           echo 'No system version of node detected.' >&2 |           echo 'No system version of node detected.' >&2 | ||||||
|           return 3 |           return 3 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user