Compare commits

...

5 Commits

Author SHA1 Message Date
Jordan Harband
7a423b7bb4 v0.11.1 2014-07-18 01:48:46 -07:00
Jordan Harband
a3de7f3222 Fixing make release - amending a tagged commit makes the commit not match the tag. 2014-07-17 00:25:14 -07:00
Jordan Harband
55d892adc8 Fix #476 by making sure to cd into $NVM_DIR before checking out the tag. Also delete the master branch, because we won't be needing that. 2014-07-17 00:20:33 -07:00
Jordan Harband
3b42df8d1d Merge pull request #474 from mzgol/wget-hotfix
Hotfix: correctly map curl's `-C -` to wget
2014-07-16 10:16:18 -07:00
Michał Gołębiowski
21fa84225c Hotfix: correctly map curl's -C - to wget
wget doesn't need or accept the `-` parameter to `-c`. This incorrect
mapping causes `nvm install` to fail on a curlless OS.
2014-07-16 11:00:56 +02:00
5 changed files with 14 additions and 13 deletions

View File

@@ -20,6 +20,7 @@ endif
release: verify-tag release: verify-tag
@ OLD_TAG=`git describe --abbrev=0 --tags` && \ @ OLD_TAG=`git describe --abbrev=0 --tags` && \
npm version "$(TAG)" && \
replace "$${OLD_TAG/v/}" "$(TAG)" -- nvm.sh install.sh README.markdown && \ replace "$${OLD_TAG/v/}" "$(TAG)" -- nvm.sh install.sh README.markdown && \
git commit --amend nvm.sh install.sh README.markdown package.json git commit -m "v$(TAG)" nvm.sh install.sh README.markdown package.json && \
git tag "v$(TAG)"

View File

@@ -8,11 +8,11 @@ First you'll need to make sure your system has a c++ compiler. For OSX, XCode w
To install you could use the [install script][2] using cURL: To install you could use the [install script][2] using cURL:
curl https://raw.githubusercontent.com/creationix/nvm/v0.11.0/install.sh | bash curl https://raw.githubusercontent.com/creationix/nvm/v0.11.1/install.sh | bash
or Wget: or Wget:
wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.11.0/install.sh | bash wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.11.1/install.sh | bash
<sub>The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile`, `~/.zshrc` or `~/.profile`).</sub> <sub>The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile`, `~/.zshrc` or `~/.profile`).</sub>
@@ -163,7 +163,7 @@ After the v0.8.6 release of node, nvm tries to install from binary packages. But
nvm install -s 0.8.6 nvm install -s 0.8.6
[1]: https://github.com/creationix/nvm.git [1]: https://github.com/creationix/nvm.git
[2]: https://github.com/creationix/nvm/blob/v0.11.0/install.sh [2]: https://github.com/creationix/nvm/blob/v0.11.1/install.sh
[3]: https://travis-ci.org/creationix/nvm [3]: https://travis-ci.org/creationix/nvm
[Urchin]: https://github.com/scraperwiki/urchin [Urchin]: https://github.com/scraperwiki/urchin

View File

@@ -22,7 +22,7 @@ nvm_download() {
ARGS=${ARGS/-I /} ARGS=${ARGS/-I /}
ARGS=${ARGS/-s /-q } ARGS=${ARGS/-s /-q }
ARGS=${ARGS/-o /-O } ARGS=${ARGS/-o /-O }
ARGS=${ARGS/-C /-c } ARGS=${ARGS/-C - /-c }
wget $ARGS wget $ARGS
fi fi
} }
@@ -35,8 +35,8 @@ install_nvm_from_git() {
if [ -d "$NVM_DIR/.git" ]; then if [ -d "$NVM_DIR/.git" ]; then
echo "=> nvm is already installed in $NVM_DIR, trying to update" echo "=> nvm is already installed in $NVM_DIR, trying to update"
printf "\r=> " printf "\r=> "
cd "$NVM_DIR" && (git pull 2> /dev/null || { cd "$NVM_DIR" && (git fetch 2> /dev/null || {
echo >&2 "Failed to update nvm, run 'git pull' in $NVM_DIR yourself.." && exit 1 echo >&2 "Failed to update nvm, run 'git fetch' in $NVM_DIR yourself." && exit 1
}) })
else else
# Cloning to $NVM_DIR # Cloning to $NVM_DIR
@@ -45,12 +45,12 @@ install_nvm_from_git() {
mkdir -p "$NVM_DIR" mkdir -p "$NVM_DIR"
git clone "$NVM_SOURCE" "$NVM_DIR" git clone "$NVM_SOURCE" "$NVM_DIR"
fi fi
git checkout v0.11.0 cd $NVM_DIR && git checkout v0.11.1 && git branch -D master
} }
install_nvm_as_script() { install_nvm_as_script() {
if [ -z "$NVM_SOURCE" ]; then if [ -z "$NVM_SOURCE" ]; then
NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.11.0/nvm.sh" NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.11.1/nvm.sh"
fi fi
# Downloading to $NVM_DIR # Downloading to $NVM_DIR

4
nvm.sh
View File

@@ -23,7 +23,7 @@ nvm_download() {
ARGS=${ARGS/-I /} ARGS=${ARGS/-I /}
ARGS=${ARGS/-s /-q } ARGS=${ARGS/-s /-q }
ARGS=${ARGS/-o /-O } ARGS=${ARGS/-o /-O }
ARGS=${ARGS/-C /-c } ARGS=${ARGS/-C - /-c }
wget $ARGS wget $ARGS
fi fi
} }
@@ -683,7 +683,7 @@ nvm() {
nvm_version $2 nvm_version $2
;; ;;
"--version" ) "--version" )
echo "0.11.0" echo "0.11.1"
;; ;;
"unload" ) "unload" )
unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version > /dev/null 2>&1 unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version > /dev/null 2>&1

View File

@@ -1,6 +1,6 @@
{ {
"name": "nvm", "name": "nvm",
"version": "0.11.0", "version": "0.11.1",
"description": "Node Version Manager - Simple bash script to manage multiple active node.js versions", "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
"directories": { "directories": {
"test": "test" "test": "test"