mirror of
				https://github.com/nvm-sh/nvm.git
				synced 2025-10-31 10:15:53 +08:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master'
Conflicts: nvm.sh
This commit is contained in:
		
							
								
								
									
										20
									
								
								nvm.sh
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								nvm.sh
									
									
									
									
									
								
							| @@ -7,7 +7,7 @@ | |||||||
|  |  | ||||||
| # Auto detect the NVM_DIR using magic bash 3.x stuff | # Auto detect the NVM_DIR using magic bash 3.x stuff | ||||||
| if [ ! -d "$NVM_DIR" ]; then | if [ ! -d "$NVM_DIR" ]; then | ||||||
|     export NVM_DIR=$(dirname ${BASH_ARGV[0]}) |     export NVM_DIR=$(cd $(dirname ${BASH_SOURCE[0]:-$0}); pwd) | ||||||
| fi | fi | ||||||
|  |  | ||||||
| # Emulate curl with wget, if necessary | # Emulate curl with wget, if necessary | ||||||
| @@ -91,11 +91,11 @@ nvm() | |||||||
|       echo "    nvm alias <name> <version>  Set an alias named <name> pointing to <version>" |       echo "    nvm alias <name> <version>  Set an alias named <name> pointing to <version>" | ||||||
|       echo |       echo | ||||||
|       echo "Example:" |       echo "Example:" | ||||||
|       echo "    nvm install v0.2.5          Install a specific version number" |       echo "    nvm install v0.4.0          Install a specific version number" | ||||||
|       echo "    nvm use stable              Use the stable release" |       echo "    nvm use stable              Use the stable release" | ||||||
|       echo "    nvm install latest          Install the latest, possibly unstable version" |       echo "    nvm install latest          Install the latest, possibly unstable version" | ||||||
|       echo "    nvm use 0.3                 Use the latest available 0.3.x release" |       echo "    nvm use 0.2                 Use the latest available 0.2.x release" | ||||||
|       echo "    nvm alias default v0.3.6    Set v0.3.6 as the default"  |       echo "    nvm alias default v0.4.0    Set v0.4.0 as the default"  | ||||||
|       echo |       echo | ||||||
|     ;; |     ;; | ||||||
|     "install" ) |     "install" ) | ||||||
| @@ -105,7 +105,7 @@ nvm() | |||||||
|       fi |       fi | ||||||
|       [ "$NOCURL" ] && curl && return |       [ "$NOCURL" ] && curl && return | ||||||
|       VERSION=`nvm_version $2` |       VERSION=`nvm_version $2` | ||||||
|       START=`pwd` |       if ( | ||||||
|         mkdir -p "$NVM_DIR/src" && \ |         mkdir -p "$NVM_DIR/src" && \ | ||||||
|         cd "$NVM_DIR/src" && \ |         cd "$NVM_DIR/src" && \ | ||||||
|         curl -C - -# "http://nodejs.org/dist/node-$VERSION.tar.gz" -o "node-$VERSION.tar.gz" && \ |         curl -C - -# "http://nodejs.org/dist/node-$VERSION.tar.gz" -o "node-$VERSION.tar.gz" && \ | ||||||
| @@ -114,13 +114,17 @@ nvm() | |||||||
|         ./configure --prefix="$NVM_DIR/$VERSION" && \ |         ./configure --prefix="$NVM_DIR/$VERSION" && \ | ||||||
|         make && \ |         make && \ | ||||||
|         rm -f "$NVM_DIR/$VERSION" 2>/dev/null && \ |         rm -f "$NVM_DIR/$VERSION" 2>/dev/null && \ | ||||||
|       make install && \ |         make install | ||||||
|  |         ) | ||||||
|  |       then | ||||||
|         nvm use $VERSION |         nvm use $VERSION | ||||||
|         if ! which npm ; then |         if ! which npm ; then | ||||||
|           echo "Installing npm..." |           echo "Installing npm..." | ||||||
|         curl -# http://npmjs.org/install.sh -o - | sh |           curl http://npmjs.org/install.sh | sh | ||||||
|  |         fi | ||||||
|  |       else | ||||||
|  |         echo "nvm: install $VERSION failed!" | ||||||
|       fi |       fi | ||||||
|       cd $START |  | ||||||
|     ;; |     ;; | ||||||
|     "deactivate" ) |     "deactivate" ) | ||||||
|       if [[ $PATH == *$NVM_DIR/*/bin* ]]; then |       if [[ $PATH == *$NVM_DIR/*/bin* ]]; then | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user