Commit Graph

555 Commits (3fa004293c6815509039354e3a10026f4fc36ef5)

Author SHA1 Message Date
Jordan Harband 304cc29cf0 Fixing indentation and adding a trailing newline. 2014-02-15 16:02:27 -08:00
Jordan Harband 0d5ee024d1 Merge pull request #356 from geekjuice/master
Change variable name to fix zsh parse issue
2014-02-11 20:38:09 -08:00
Nicholas Hwang 9a88e3656c Change variable name to fix zsh parse issue 2014-02-11 22:55:02 -05:00
Jordan Harband c19535a3f5 Merge pull request #354 from simontabor/patch-1
don't curl if version is specified + installed
2014-02-07 10:32:23 -08:00
Simon Tabor 9af7409e4a don't curl if version is specified + installed
Removes CURL to match the version pattern if an explicit version (e.g. `v0.10.25`) is specified and already installed.
2014-02-06 13:02:57 +00:00
Jordan Harband eca6118023 Merge pull request #352 from gdi2290/patch-1
update copyright year range in readme
2014-02-03 19:30:52 -08:00
PatrickJS 50485d641b update copyright year range in readme 2014-02-03 17:07:56 -08:00
Jordan Harband cd378cb170 Merge pull request #351 from gdi2290/patch-1
update copyright year range
2014-02-03 14:27:25 -08:00
PatrickJS db7e0976f2 update copyright year range 2014-02-03 13:41:27 -08:00
Jordan Harband ecb7a15baa Using our conventional NVM_ prefix for env vars.
Per https://github.com/creationix/nvm/pull/245#issuecomment-33821443
2014-01-31 10:01:37 -08:00
Jordan Harband 5f225cd625 Merge pull request #245 from rgbkrk/mirror_z
Add mirror option for node binaries. Relates to #255.
2014-01-30 21:25:46 -08:00
Kyle Kelley 8599ea29f9 Add dist to path, add docs 2014-01-30 19:22:44 -08:00
Kyle Kelley b1d0cfa77b Added mirror option for node binaries 2014-01-30 19:16:36 -08:00
Jordan Harband a0a2ee4414 Merge pull request #349 from zyxar/master
Fixes #346
2014-01-14 21:59:30 -08:00
Markus Z 60e66fa7be Fixes #346 2014-01-15 12:48:08 +08:00
Jordan Harband 45eff43cd0 Merge pull request #342 from txgruppi/master
export NODE_PATH on nvm use
2014-01-13 21:08:17 -08:00
Tarcisio Gruppi eb588566f2
Removed PREVIOUS_NODE_PATH 2014-01-13 09:15:45 -02:00
Jordan Harband 17daa68a35 Merge pull request #344 from dhoppe/patch-1
Update nvm.sh
2014-01-03 10:16:53 -08:00
Dennis Hoppe 47c87b8478 Update nvm.sh
Examples should point to latest stable release. ;)
2014-01-03 14:45:46 +01:00
Tarcisio Gruppi 58dafdaedd
Update NODE_PATH on use, run and deactivate 2014-01-01 02:04:37 -02:00
Tarcisio Gruppi 4d2faba9af
export NODE_PATH on nvm use 2013-12-31 22:35:19 -02:00
Jordan Harband bc4c5644f5 Merge pull request #335 from naartjie/#299
fix copy-packages in zsh
2013-12-26 11:02:28 -08:00
Marcin Jekot 950da2b836 Merge branch 'master' into #299 2013-12-25 18:14:24 +02:00
Jordan Harband 2459843b92 Merge pull request #279 from frasertweedale/fix/readme-shell-names
readme: be inclusive of zsh when discussing shells
2013-12-23 14:16:42 -08:00
Fraser Tweedale 58033251fd readme: be inclusive of zsh when discussing shells
Much of the discussion in the README pertains to zsh as much as
bash, so include a specific reference to ~/.zshrc and remove one
explicit reference to bash.
2013-12-24 07:24:31 +10:00
Jordan Harband 8df2dd2ba8 Merge pull request #278 from frasertweedale/fix/manpath
fix MANPATH generation on FreeBSD
2013-12-23 10:11:06 -08:00
Fraser Tweedale 591a3bb19d fix MANPATH generation on FreeBSD
On FreeBSD, if MANPATH is set it is used verbatim; configuration
files are completely ignored.  Therefore, setting MANPATH to (only)
the nvm man dir makes system man pages unreachable.

To get around this, before doing anything else to MANPATH, if it is
empty set it to the output of manpath(1).

One further complication: FreeBSD automatically adds a path to the
man pages path for each path in PATH that ends in "/bin", which
causes "~/.nvm/$VERSION/man" to be added.  This interferes with the
subsequent substitution so strip this from MANPATH before the
substitution.
2013-12-23 21:31:18 +10:00
Marcin Jekot 679c71650f fix copy-packages in zsh
fixes #299, finally, using the local var syntax
2013-12-18 17:21:00 +02:00
Jordan Harband 5c7996da5b Merge pull request #332 from ljharb/add_package_json
Add package json
2013-12-17 13:17:52 -08:00
Jordan Harband 9021cf579a Updating the README. 2013-12-17 13:12:05 -08:00
Jordan Harband 7afe2c5e2d Add a package.json. 2013-12-17 13:12:05 -08:00
Jordan Harband 8143f5a618 ignore more urchin output. 2013-12-17 13:07:52 -08:00
Jordan Harband c211357e70 Ignore node_modules. 2013-12-17 13:07:02 -08:00
Jordan Harband 3eb09ab984 Merge pull request #330 from mibamur/patch-1
Update nvm.sh
2013-12-17 10:25:24 -08:00
Michael 670870e211 Update nvm.sh
fix#https://github.com/creationix/nvm/pull/330
2013-12-18 02:07:02 +09:00
Michael 74ca011704 Update nvm.sh
fix https://github.com/creationix/nvm/pull/330
2013-12-18 02:06:23 +09:00
Jordan Harband 83c5b6286d Add `nvm current` to `nvm help`. Relates to #205. 2013-12-16 23:40:47 -08:00
Jordan Harband d7015c7f65 Merge pull request #205 from deiga/add-current-command
Added command to get current nvm environment.
2013-12-16 23:39:23 -08:00
Timo Sand 4ca71d81cf Changed test according to comments 2013-12-17 08:28:31 +02:00
Jordan Harband ed69b5cc71 Merge pull request #331 from deiga/patch-1
Update README.markdown
2013-12-16 22:06:54 -08:00
Timo Sand f9d5a85f05 Merge branch 'master' into add-current-command 2013-12-17 08:06:16 +02:00
Timo Sand 1f3ea299fa Update README.markdown 2013-12-17 08:01:06 +02:00
Michael b2ef0cb14c Update nvm.sh
Fix - this line should be nvm use 0.10 - no 'v', and no incremental version number.
2013-12-16 23:25:50 +09:00
Michael 59c4dc735a Update nvm.sh
small fix fo nvm help info
2013-12-16 05:04:14 +09:00
Jordan Harband ce7d2e7618 Merge pull request #328 from naartjie/master
fix copy-packages in zsh (without breaking sh and bash). Closes #223, fixes #299.
2013-12-15 10:32:41 -08:00
Marcin Jekot 4df45ac51a merge in changes from creationix/nvm 2013-12-15 11:27:15 +02:00
Jordan Harband 8573b95a2d Merge pull request #327 from stuartf/issue-314
fix copy-packages
2013-12-13 15:37:28 -08:00
Marcin Jekot 94fff5c923 fix copy-packages in zsh (without breaking sh and bash) 2013-12-14 01:14:34 +02:00
D. Stuart Freeman 56e32888ea fix copy-packages 2013-12-12 10:52:43 -05:00
Jordan Harband b186b6327a Merge pull request #326 from koenpunt/has-command-helper
helper method for testing existence of commands
2013-12-12 02:21:52 -08:00