Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed #1278, use backslash in case of overridden dot #1279

Merged
merged 2 commits into from
Nov 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.32.1/install.sh |

```sh
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
```

You can customize the install source, directory, profile, and version using the `NVM_SOURCE`, `NVM_DIR`, `PROFILE`, and `NODE_VERSION` variables.
Expand Down Expand Up @@ -124,7 +124,7 @@ Add these lines to your `~/.bashrc`, `~/.profile`, or `~/.zshrc` file to have it

```sh
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
```

### Manual upgrade
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ nvm_do_install() {
local INSTALL_DIR
INSTALL_DIR="$(nvm_install_dir)"

SOURCE_STR="\nexport NVM_DIR=\"$INSTALL_DIR\"\n[ -s \"\$NVM_DIR/nvm.sh\" ] && . \"\$NVM_DIR/nvm.sh\" # This loads nvm\n"
SOURCE_STR="\nexport NVM_DIR=\"$INSTALL_DIR\"\n[ -s \"\$NVM_DIR/nvm.sh\" ] && \\. \"\$NVM_DIR/nvm.sh\" # This loads nvm\n"

if [ -z "${NVM_PROFILE-}" ] ; then
echo "=> Profile not found. Tried ${NVM_PROFILE} (as defined in \$PROFILE), ~/.bashrc, ~/.bash_profile, ~/.zshrc, and ~/.profile."
Expand Down
2 changes: 1 addition & 1 deletion nvm-exec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DIR="$(command cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

. "$DIR/nvm.sh" --no-use
\. "$DIR/nvm.sh" --no-use

if [ -n "$NODE_VERSION" ]; then
nvm use $NODE_VERSION > /dev/null || exit 127
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

die () { echo $@ ; exit 1; }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

die () { echo $@ ; exit 1; }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

. ../../../nvm.sh
. ../../common.sh
\. ../../../nvm.sh
\. ../../common.sh

die () { echo $@ ; exit 1; }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh
[ $(nvm alias test-stable-1 | wc -l) = '2' ]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

. ../../../nvm.sh
. ../../common.sh
\. ../../../nvm.sh
\. ../../common.sh

die () { echo $@ ; exit 1; }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

. ../../../nvm.sh
. ../../common.sh
\. ../../../nvm.sh
\. ../../common.sh

die () { echo $@ ; cleanup ; exit 1; }
cleanup () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

. ../../../nvm.sh
. ../../common.sh
\. ../../../nvm.sh
\. ../../common.sh

die () { echo $@ ; exit 1; }

Expand Down
4 changes: 2 additions & 2 deletions test/fast/Aliases/circular/nvm_resolve_alias
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
. ../../../common.sh
\. ../../../common.sh

die () { echo $@ ; exit 1; }

. ../../../../nvm.sh
\. ../../../../nvm.sh

ALIAS="$(nvm_resolve_alias loopback | strip_colors)"
[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_alias loopback was not ∞; got $ALIAS"
Expand Down
4 changes: 2 additions & 2 deletions test/fast/Aliases/circular/nvm_resolve_local_alias
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
. ../../../common.sh
\. ../../../common.sh

die () { echo $@ ; exit 1; }

. ../../../../nvm.sh
\. ../../../../nvm.sh

ALIAS="$(nvm_resolve_local_alias loopback | strip_colors)"
[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias loopback was not ∞; got $ALIAS"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -ex

. ../../../../nvm.sh
. ../../../common.sh
\. ../../../../nvm.sh
\. ../../../common.sh

LTS_ALIAS_PATH="$(nvm_alias_path)/lts"

Expand Down
2 changes: 1 addition & 1 deletion test/fast/Aliases/lts/setup_dir
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../../nvm.sh
\. ../../../../nvm.sh

LTS_ALIAS_PATH="$(nvm_alias_path)/lts"

Expand Down
2 changes: 1 addition & 1 deletion test/fast/Aliases/lts/teardown_dir
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../../nvm.sh
\. ../../../../nvm.sh

LTS_ALIAS_PATH="$(nvm_alias_path)/lts"

Expand Down
4 changes: 2 additions & 2 deletions test/fast/Aliases/nvm_ensure_default_set
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/sh

. ../../common.sh
\. ../../common.sh

die () { echo $@ ; exit 1; }

. ../../../nvm.sh
\. ../../../nvm.sh

nvm alias default 0.1 >/dev/null || die "'nvm alias default 0.1' failed"

Expand Down
2 changes: 1 addition & 1 deletion test/fast/Aliases/nvm_resolve_alias
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

die () { echo $@ ; exit 1; }

. ../../../nvm.sh
\. ../../../nvm.sh

EXIT_CODE=$(nvm_resolve_alias ; echo $?)
[ $EXIT_CODE = "1" ] || die "nvm_resolve_alias without an argument did not return 1; got $EXIT_CODE"
Expand Down
2 changes: 1 addition & 1 deletion test/fast/Aliases/nvm_resolve_local_alias
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

die () { echo $@ ; exit 1; }

. ../../../nvm.sh
\. ../../../nvm.sh

EXIT_CODE=$(nvm_resolve_local_alias ; echo $?)
[ "_$EXIT_CODE" = "_1" ] || die "nvm_resolve_local_alias without an argument did not return 1; got $EXIT_CODE"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir -p "${NVM_DIR}/v0.0.2"
mkdir -p "${NVM_DIR}/v0.0.20"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

nvm which nonexistent_version
[ "_$?" = "_1" ]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir "${NVM_DIR}/v0.0.2"
mkdir "${NVM_DIR}/v0.0.20"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir "${NVM_DIR}/v0.1.3"
mkdir "${NVM_DIR}/v0.2.3"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

nvm ls nonexistent_version
[ "$?" = "3" ]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

nvm ls io
[ "$?" = "3" ]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

nvm ls node_
[ "$?" = "3" ]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

die () { echo $@ ; exit 1; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

die () { echo $@ ; exit 1; }

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir -p "${NVM_DIR}/v0.0.1"
mkdir -p "${NVM_DIR}/v0.0.3"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir "${NVM_DIR}/v0.0.1"
mkdir "${NVM_DIR}/v0.0.3"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir "${NVM_DIR}/v0.1.3"
mkdir "${NVM_DIR}/v0.2.3"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir "${NVM_DIR}/v0.1.3"
mkdir "${NVM_DIR}/v0.2.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

die () { echo $@ ; exit 1; }

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir -p "${NVM_DIR}/v0.0.1"
mkdir -p "${NVM_DIR}/v0.0.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

die () { echo $@ ; exit 1; }

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir -p "${NVM_DIR}/versions/node/v0.12.1"
mkdir "${NVM_DIR}/v0.1.3"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

. ../../../nvm.sh
\. ../../../nvm.sh

mkdir "${NVM_DIR}/v0.1.2"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -ex

. ../../nvm.sh
\. ../../nvm.sh

nvm alias test v0.1.2

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -ex

die () { echo $@ ; exit 1; }

. ../../nvm.sh
\. ../../nvm.sh

nvm deactivate 2>&1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ die () { echo $@ ; exit 1; }

[ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] || echo "WARNING: Unexpectedly found v0.2.3 already active" >&2

. ../../nvm.sh
\. ../../nvm.sh

nvm use --delete-prefix v0.2.3 || die "Failed to activate v0.2.3"
[ `expr "$PATH" : ".*v0.2.3/.*/bin"` != 0 ] || die "PATH not set up properly"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cleanup () {
rm -rf "${NVM_DIR}/v0.10.4"
}

. ../../nvm.sh
\. ../../nvm.sh

mkdir "${NVM_DIR}/v0.10.4"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -ex

die () { echo $@ ; exit 1; }

. ../../nvm.sh
\. ../../nvm.sh

set +ex # needed for stderr
OUTPUT="$(nvm install invalid.invalid 2>&1)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ALIAS_PATH="../../alias"

echo v0.1.2 > "${ALIAS_PATH}/test"

. ../../nvm.sh
\. ../../nvm.sh

nvm unalias test

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -ex

die () { echo $@ ; exit 1; }

. ../../nvm.sh
\. ../../nvm.sh

type nvm > /dev/null 2>&1 || die "nvm not loaded"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cleanup() {
rm -rf "$(nvm_alias_path)/foo"
}

. ../../nvm.sh
\. ../../nvm.sh

nvm_make_alias foo foo

Expand Down
4 changes: 2 additions & 2 deletions test/fast/Running "nvm use iojs" uses latest io.js version
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -ex

. ../common.sh
\. ../common.sh

die () { echo $@ ; cleanup ; exit 1; }

Expand All @@ -13,7 +13,7 @@ cleanup() {
rm -rf "$(nvm_version_path "iojs-${VERSION}")"
}

. ../../nvm.sh
\. ../../nvm.sh

nvm deactivate || die "unable to deactivate; current: >$(nvm current)<"

Expand Down
Loading