950da2b836
Merge branch 'master' into #299
2013-12-25 18:14:24 +02:00
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
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
8df2dd2ba8
Merge pull request #278 from frasertweedale/fix/manpath
...
fix MANPATH generation on FreeBSD
2013-12-23 10:11:06 -08:00
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
679c71650f
fix copy-packages in zsh
...
fixes #299 , finally, using the local var syntax
2013-12-18 17:21:00 +02:00
5c7996da5b
Merge pull request #332 from ljharb/add_package_json
...
Add package json
2013-12-17 13:17:52 -08:00
9021cf579a
Updating the README.
2013-12-17 13:12:05 -08:00
7afe2c5e2d
Add a package.json.
2013-12-17 13:12:05 -08:00
8143f5a618
ignore more urchin output.
2013-12-17 13:07:52 -08:00
c211357e70
Ignore node_modules.
2013-12-17 13:07:02 -08:00
3eb09ab984
Merge pull request #330 from mibamur/patch-1
...
Update nvm.sh
2013-12-17 10:25:24 -08:00
670870e211
Update nvm.sh
...
fix#https://github.com/creationix/nvm/pull/330
2013-12-18 02:07:02 +09:00
74ca011704
Update nvm.sh
...
fix https://github.com/creationix/nvm/pull/330
2013-12-18 02:06:23 +09:00
83c5b6286d
Add `nvm current` to `nvm help`. Relates to #205 .
2013-12-16 23:40:47 -08:00
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
4ca71d81cf
Changed test according to comments
2013-12-17 08:28:31 +02:00
ed69b5cc71
Merge pull request #331 from deiga/patch-1
...
Update README.markdown
2013-12-16 22:06:54 -08:00
f9d5a85f05
Merge branch 'master' into add-current-command
2013-12-17 08:06:16 +02:00
1f3ea299fa
Update README.markdown
2013-12-17 08:01:06 +02:00
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
59c4dc735a
Update nvm.sh
...
small fix fo nvm help info
2013-12-16 05:04:14 +09:00
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
4df45ac51a
merge in changes from creationix/nvm
2013-12-15 11:27:15 +02:00
8573b95a2d
Merge pull request #327 from stuartf/issue-314
...
fix copy-packages
2013-12-13 15:37:28 -08:00
94fff5c923
fix copy-packages in zsh (without breaking sh and bash)
2013-12-14 01:14:34 +02:00
56e32888ea
fix copy-packages
2013-12-12 10:52:43 -05:00
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
e99fc43ab2
helper method for testing existence of commands
2013-12-12 10:46:40 +01:00
cf515c4ff8
Merge pull request #324 from hurrymaplelad/quiet_type
...
Slurp stderr from test unsetopt
2013-12-11 18:32:06 -08:00
037f52a55b
Slurp test unsetopt stderr
2013-12-11 15:23:19 -08:00
b714db7a95
Merge pull request #322 from koenpunt/fix-unsetopt-test
...
Universal test of unsetopt command. Closes #300
2013-12-11 09:28:58 -08:00
aba4346a86
Universal test of unsetopt command
...
According to http://stackoverflow.com/a/7522866/189431 it should work in "bash, zsh, ksh and sh (as provided by dash)".
2013-12-11 13:49:58 +01:00
5686d9a3bb
Addressing comments raised in #171
2013-11-29 14:26:12 -06:00
49e9a309c3
Merge pull request #305 from marioidival/patch-1
...
For zsh users
2013-11-13 11:02:56 -08:00
788d87774f
Merge pull request #312 from quiqueg/master
...
Fixed bash error caused by lack of double quotes
2013-10-25 09:32:59 -07:00
7ccc2dd5ed
Merge pull request #311 from loganfsmyth/remove-tar
...
Properly remove the tar file.
2013-10-24 22:52:18 -07:00
7862182d6f
Add -f
2013-10-24 20:09:33 -07:00
b4a9c14d4e
Fixed bash error caused by lack of double quotes
2013-10-24 18:59:37 -07:00
473dd86f48
Properly remove the tar file.
2013-10-23 22:14:02 -07:00
6e1c249ecd
For zsh users
...
i use zsh and i did this update in install.sh local, is good for you too :)
2013-10-10 14:30:53 -03:00
dc7a42062e
Added test for `nvm current`
2013-10-10 07:58:51 +03:00
dd157129a6
Added command to get current nvm environment.
2013-10-10 07:56:57 +03:00
d3f04c793e
Merge pull request #296 from frasertweedale/fix/generic-source
...
install.sh: use a more generic SOURCE_STR
2013-09-23 20:37:08 -07:00
ef7e3cc39a
install.sh: use a more generic SOURCE_STR
...
SOURCE_STR currently includes the value of $HOME (at install time).
Change SOURCE_STR to include a literal "$HOME" (to be expanded at
profile runtime) so that sourcing nvm will work if the user changes
their username, shares their profile, et cetera.
Also use the more portable single-square-bracket test.
2013-09-22 14:58:19 +10:00
e6116d96ab
Mentioning `install-gitless.sh` in the "no git" error message - finishing off #246 .
2013-09-21 12:58:01 -07:00
5e2ad5bb8d
Merge pull request #246 from ddryden/master
...
Add check for git in the installer script.
2013-09-21 12:55:55 -07:00
a7a91441aa
Merge pull request #294 from 00Davo/patch-1
...
Finds NVM_DIR with `cd -q` on zsh
2013-09-18 10:14:44 -07:00
a2a8ddb779
Use only shell builtins to avoid triggering autojump, instead of needing GNU readlink
...
Under Zsh, the `-q` flag to `cd` makes it not run `chpwd` hooks and hence makes it not add `~/.nvm` to `autojump`.
2013-09-19 02:50:20 +10:00
1ad9d18257
Finds NVM_DIR without using cd
...
Using `cd` makes the nvm directory the number-one directory in `autojump`'s database---which is somewhat confusing since the user basically never `cd`s to it directly!---so here's an alternative method that doesn't use the `cd` command. I've checked it works in both Bash and Zsh.
2013-09-18 17:10:24 +10:00
Marcin Jekot
Jordan Harband
Fraser Tweedale
Michael
Timo Sand
D. Stuart Freeman
Koen Punt
Adam Hull
Logan Smyth
Matthew Alexander
Mario Idival
00Davo