This commit is contained in:
Yosiya Hinosawa 2013-01-13 00:08:55 -08:00
commit 9ae465b613
4 changed files with 76 additions and 31 deletions

View File

@ -144,3 +144,6 @@ on Arch Linux and other systems using python3 by default, before running *instal
export PYTHON=python2 export PYTHON=python2
After the v0.8.6 release of node, nvm tries to install from binary packages. But in some systems, the official binary packages don't work due to incompatibility of shared libs. In such cases, use `-s` option to force install from source:
nvm install -s 0.8.6

24
nvm.sh
View File

@ -151,7 +151,7 @@ nvm()
echo echo
echo "Usage:" echo "Usage:"
echo " nvm help Show this message" echo " nvm help Show this message"
echo " nvm install <version> Download and install a <version>" echo " nvm install [-s] <version> Download and install a <version>"
echo " nvm uninstall <version> Uninstall a version" echo " nvm uninstall <version> Uninstall a version"
echo " nvm use <version> Modify PATH to use <version>" echo " nvm use <version> Modify PATH to use <version>"
echo " nvm run <version> [<args>] Run <version> with <args> as arguments" echo " nvm run <version> [<args>] Run <version> with <args> as arguments"
@ -180,6 +180,7 @@ nvm()
local sum local sum
local tarball local tarball
local shasum='shasum' local shasum='shasum'
local nobinary
if [ ! `which curl` ]; then if [ ! `which curl` ]; then
echo 'NVM Needs curl to proceed.' >&2; echo 'NVM Needs curl to proceed.' >&2;
@ -193,10 +194,20 @@ nvm()
nvm help nvm help
return return
fi fi
VERSION=`nvm_remote_version $2`
shift
nobinary=0
if [ "$1" = "-s" ]; then
nobinary=1
shift
fi
VERSION=`nvm_remote_version $1`
ADDITIONAL_PARAMETERS='' ADDITIONAL_PARAMETERS=''
shift shift
shift
while [ $# -ne 0 ] while [ $# -ne 0 ]
do do
ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1" ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
@ -205,19 +216,21 @@ nvm()
[ -d "$NVM_DIR/$VERSION" ] && echo "$VERSION is already installed." && return [ -d "$NVM_DIR/$VERSION" ] && echo "$VERSION is already installed." && return
# skip binary install if no binary option specified.
if [ $nobinary -ne 1 ]; then
# shortcut - try the binary if possible. # shortcut - try the binary if possible.
if [ -n "$os" ]; then if [ -n "$os" ]; then
binavail= binavail=
# binaries started with node 0.8.6 # binaries started with node 0.8.6
case "$VERSION" in case "$VERSION" in
v0.8.[012345]) binavail=0 ;; v0.8.[012345]) binavail=0 ;;
v0.[1234567]) binavail=0 ;; v0.[1234567].*) binavail=0 ;;
*) binavail=1 ;; *) binavail=1 ;;
esac esac
if [ $binavail -eq 1 ]; then if [ $binavail -eq 1 ]; then
t="$VERSION-$os-$arch" t="$VERSION-$os-$arch"
url="http://nodejs.org/dist/$VERSION/node-${t}.tar.gz" url="http://nodejs.org/dist/$VERSION/node-${t}.tar.gz"
sum=`curl -s http://nodejs.org/dist/$VERSION/SHASUMS.txt.asc | grep node-${t}.tar.gz | awk '{print $1}'` sum=`curl -s http://nodejs.org/dist/$VERSION/SHASUMS.txt | grep node-${t}.tar.gz | awk '{print $1}'`
if ( if (
mkdir -p "$NVM_DIR/bin/node-${t}" && \ mkdir -p "$NVM_DIR/bin/node-${t}" && \
cd "$NVM_DIR/bin" && \ cd "$NVM_DIR/bin" && \
@ -236,6 +249,7 @@ nvm()
fi fi
fi fi
fi fi
fi
echo "Additional options while compiling: $ADDITIONAL_PARAMETERS" echo "Additional options while compiling: $ADDITIONAL_PARAMETERS"

14
test/slow/install from binary Executable file
View File

@ -0,0 +1,14 @@
#!/bin/sh
set -e
. ../../nvm.sh
# Remove the stuff we're clobbering.
[ -e ../../v0.8.6 ] && rm -R ../../v0.8.6
# Install from binary
nvm install 0.8.6
# Check
[ -d ../../v0.8.6 ]
nvm run v0.8.6 --version | grep v0.8.6

14
test/slow/install from source Executable file
View File

@ -0,0 +1,14 @@
#!/bin/sh
set -e
. ../../nvm.sh
# Remove the stuff we're clobbering.
[ -e ../../v0.8.6 ] && rm -R ../../v0.8.6
# Install from source
nvm install -s 0.8.6
# Check
[ -d ../../v0.8.6 ]
nvm run v0.8.6 --version | grep v0.8.6