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

fix nvm_curl arguments for stdout

master
Koen Punt 2014-07-07 23:16:20 +02:00
parent df4689fbd2
commit a0de15d0f7
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install.sh
View File

@ -20,10 +20,9 @@ nvm_curl() {
ARGS=${ARGS/--progress-bar /--progress=bar } ARGS=${ARGS/--progress-bar /--progress=bar }
ARGS=${ARGS/-L /} ARGS=${ARGS/-L /}
ARGS=${ARGS/-I /} ARGS=${ARGS/-I /}
ARGS=${ARGS/-s /-qO- } ARGS=${ARGS/-s /-q }
ARGS=${ARGS/-o /-O } ARGS=${ARGS/-o /-O }
ARGS=${ARGS/-C /-c } ARGS=${ARGS/-C /-c }
ARGS=${ARGS/ - / }
wget $ARGS wget $ARGS
fi fi
} }

17
nvm.sh
View File

@ -21,10 +21,9 @@ nvm_curl() {
ARGS=${ARGS/--progress-bar /--progress=bar } ARGS=${ARGS/--progress-bar /--progress=bar }
ARGS=${ARGS/-L /} ARGS=${ARGS/-L /}
ARGS=${ARGS/-I /} ARGS=${ARGS/-I /}
ARGS=${ARGS/-s /-qO- } ARGS=${ARGS/-s /-q }
ARGS=${ARGS/-o /-O } ARGS=${ARGS/-o /-O }
ARGS=${ARGS/-C /-c } ARGS=${ARGS/-C /-c }
ARGS=${ARGS/ - / }
wget $ARGS wget $ARGS
fi fi
} }
@ -181,7 +180,7 @@ nvm_ls_remote() {
else else
PATTERN=".*" PATTERN=".*"
fi fi
VERSIONS=`nvm_curl -s $NVM_NODEJS_ORG_MIRROR/ \ VERSIONS=`nvm_curl -s $NVM_NODEJS_ORG_MIRROR/ -o - \
| \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' \ | \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' \
| \grep -w "${PATTERN}" \ | \grep -w "${PATTERN}" \
| sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n` | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n`
@ -371,7 +370,7 @@ nvm() {
if nvm_binary_available "$VERSION"; then if nvm_binary_available "$VERSION"; then
t="$VERSION-$os-$arch" t="$VERSION-$os-$arch"
url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz" url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz"
sum=`nvm_curl -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt | \grep node-${t}.tar.gz | awk '{print $1}'` sum=`nvm_curl -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | \grep node-${t}.tar.gz | awk '{print $1}'`
local tmpdir local tmpdir
tmpdir="$NVM_DIR/bin/node-${t}" tmpdir="$NVM_DIR/bin/node-${t}"
local tmptarball local tmptarball
@ -408,10 +407,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 -s -I "$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" -o - | \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 -o - | \grep node-$VERSION.tar.gz | awk '{print $1}'`
elif [ "`nvm_curl -s -I "$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" -o - | \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 (
@ -436,10 +435,10 @@ nvm() {
if [ "`expr "$VERSION" : '\(^v0\.2\.[0-2]$\)'`" != '' ]; then if [ "`expr "$VERSION" : '\(^v0\.2\.[0-2]$\)'`" != '' ]; then
echo "npm requires node v0.2.3 or higher" >&2 echo "npm requires node v0.2.3 or higher" >&2
else else
nvm_curl https://npmjs.org/install.sh | clean=yes npm_install=0.2.19 sh nvm_curl https://npmjs.org/install.sh -o - | clean=yes npm_install=0.2.19 sh
fi fi
else else
nvm_curl https://npmjs.org/install.sh | clean=yes sh nvm_curl https://npmjs.org/install.sh -o - | clean=yes sh
fi fi
fi fi
else else