273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure both wget and curl work.

master
Jordan Harband 2014-07-07 13:32:08 -07:00
parent 74cc1eb022
commit 018e47bec0
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.sh
View File

@ -17,12 +17,14 @@ nvm_curl() {
elif nvm_has "wget"; then elif nvm_has "wget"; then
# Emulate curl with wget # Emulate curl with wget
ARGS="$*" ARGS="$*"
ARGS=${ARGS/--progress-bar /} echo "original: $ARGS"
ARGS=${ARGS/--progress-bar /--progress=bar }
ARGS=${ARGS/-L /} ARGS=${ARGS/-L /}
ARGS=${ARGS/-I /} ARGS=${ARGS/-I /}
ARGS=${ARGS/-s /-q } ARGS=${ARGS/-s /-qO- }
ARGS=${ARGS/-o /-O } ARGS=${ARGS/-o /-O }
ARGS=${ARGS/-C /-c } ARGS=${ARGS/-C /-c }
ARGS=${ARGS/ - / }
wget $ARGS wget $ARGS
fi fi
} }

12
nvm.sh
View File

@ -18,13 +18,15 @@ nvm_curl() {
elif nvm_has "wget"; then elif nvm_has "wget"; then
# Emulate curl with wget # Emulate curl with wget
ARGS="$*" ARGS="$*"
ARGS=${ARGS/--progress-bar /} echo "original: $ARGS"
ARGS=${ARGS/--progress-bar /--progress=bar }
ARGS=${ARGS/-L /} ARGS=${ARGS/-L /}
ARGS=${ARGS/-I /} ARGS=${ARGS/-I /}
ARGS=${ARGS/-s /-q } ARGS=${ARGS/-s /-qO- }
ARGS=${ARGS/-o /-O } ARGS=${ARGS/-o /-O }
ARGS=${ARGS/-C /-c } ARGS=${ARGS/-C /-c }
wget "$ARGS" ARGS=${ARGS/ - / }
wget $ARGS
fi fi
} }
@ -407,10 +409,10 @@ nvm() {
tmpdir="$NVM_DIR/src" tmpdir="$NVM_DIR/src"
local tmptarball local tmptarball
tmptarball="$tmpdir/node-$VERSION.tar.gz" tmptarball="$tmpdir/node-$VERSION.tar.gz"
if [ "`nvm_curl -Is "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then if [ "`nvm_curl -s -I "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then
tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz"
sum=`nvm_curl -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt | \grep node-$VERSION.tar.gz | awk '{print $1}'` sum=`nvm_curl -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt | \grep node-$VERSION.tar.gz | awk '{print $1}'`
elif [ "`nvm_curl -Is "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then elif [ "`nvm_curl -s -I "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then
tarball="$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" tarball="$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz"
fi fi
if ( if (