[spam]

.travis.yml

@@ -4,6 +4,7 @@ addons:
   apt:
     packages:
       - zsh
+<<<<<<< HEAD
     #  - ksh
     #  - gcc-4.8
     #  - g++-4.8
@@ -12,6 +13,8 @@ addons:
 git:
   submodules: false
 
+=======
+>>>>>>> f9670e18a6bec3a93c8e904c96f008704c4e798e
 cache:
   ccache: true
   directories:
@@ -31,8 +34,12 @@ before_install:
   - bash --version | head
   - zsh  --version
   - dpkg -s dash | grep ^Version | awk '{print $2}'
+<<<<<<< HEAD
   # install python
   - pyenv local 2.7.18 || pyenv install 2.7.18
+=======
+  - pyenv install 2.7.18
+>>>>>>> f9670e18a6bec3a93c8e904c96f008704c4e798e
   - pyenv local 2.7.18 || echo 'pyenv failed'
   - python -V
 install:
@@ -60,10 +67,6 @@ jobs:
       dist: xenial
     - env: SHELL=zsh TEST_SUITE=installation_node WITHOUT_CURL=1
       dist: xenial
-    #- env: SHELL=ksh TEST_SUITE=installation_node
-    #  dist: xenial
-    #- env: SHELL=ksh TEST_SUITE=installation_node WITHOUT_CURL=1
-    #  dist: xenial
     - env: SHELL=bash TEST_SUITE=xenial
       dist: xenial
     - env: SHELL=sh TEST_SUITE=xenial
@@ -72,8 +75,6 @@ jobs:
       dist: xenial
     - env: SHELL=zsh TEST_SUITE=xenial
       dist: xenial
-    #- env: SHELL=ksh TEST_SUITE=xenial
-    #  dist: xenial
 env:
   global:
     - CXX=g++
@@ -86,24 +87,19 @@ env:
     - SHELL=dash TEST_SUITE=fast
     - SHELL=bash TEST_SUITE=fast
     - SHELL=zsh TEST_SUITE=fast
-    #  - SHELL=ksh TEST_SUITE=fast
     - SHELL=sh TEST_SUITE=sourcing
     - SHELL=dash TEST_SUITE=sourcing
     - SHELL=bash TEST_SUITE=sourcing
     - SHELL=zsh TEST_SUITE=sourcing
-    #  - SHELL=ksh TEST_SUITE=sourcing
     - SHELL=sh TEST_SUITE=slow
     - SHELL=dash TEST_SUITE=slow
     - SHELL=bash TEST_SUITE=slow
     - SHELL=zsh TEST_SUITE=slow
-    #  - SHELL=ksh TEST_SUITE=slow
     - SHELL=sh TEST_SUITE=installation_iojs
     - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1
     - SHELL=dash TEST_SUITE=installation_iojs
     - SHELL=dash TEST_SUITE=installation_iojs WITHOUT_CURL=1
     - SHELL=bash TEST_SUITE=installation_iojs
     - SHELL=bash TEST_SUITE=installation_iojs WITHOUT_CURL=1
     - SHELL=zsh TEST_SUITE=installation_iojs
-    - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1
-    #  - SHELL=ksh TEST_SUITE=installation_iojs
-    #  - SHELL=ksh TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "jianglinghao.vscode-npm-scripts",
+        "stevenhansel.vscode-nvm",
+        "vadimcn.vscode-lldb"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "npm-scripts.showStartNotification": false,
+    "compile-hero.disable-compile-files-on-did-save-code": false
+}

CODE_OF_CONDUCT.md

@@ -34,92 +34,3 @@ For more information, refer to the full [Code of Conduct governance document](ht
 
 ---
 
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [@ljharb]([email protected]).
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

compose-dev.yaml

@@ -0,0 +1,12 @@
+services:
+  app:
+    entrypoint:
+    - sleep
+    - infinity
+    image: docker/dev-environments-javascript:stable-1
+    init: true
+    volumes:
+    - type: bind
+      source: /var/run/docker.sock
+      target: /var/run/docker.sock
+

package.json

@@ -45,7 +45,12 @@
     "eclint": "^2.8.1",
     "markdown-link-check": "^3.12.2",
     "replace": "^1.2.2",
+<<<<<<< HEAD
     "semver": "^7.6.3",
     "urchin": "^0.0.5"
+=======
+    "semver": "^7.5.4",
+    "urchin": "^2.0.11"
+>>>>>>> f9670e18a6bec3a93c8e904c96f008704c4e798e
   }
-}
+}

test/fast/Aliases/'nvmalias' should ignore leading blank lines in the file

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+die() { echo "$@" ; exit 1; }
+
+export NVM_DIR="$(cd ../../.. && pwd)"
+
+\. "${NVM_DIR}/nvm.sh"
+\. ../../common.sh
+
+echo "
+
+v0.0.1
+" > ../../../alias/test-blank-lines
+
+EXPECTED='v0.0.1'
+ACTUAL="$(nvm_alias test-blank-lines)"
+EXIT_CODE="$(nvm_alias test-blank-lines 2>&1 >/dev/null; echo $?)"
+
+[ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<"
+[ "${EXIT_CODE}" = '0' ] || die "expected exit code 0, got ${EXIT_CODE}"

test/fast/Aliases/'nvmalias' should not accept aliases with slashes

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+\. ../../../nvm.sh
+
+die () { echo "$@" ; exit 1; }
+
+OUTPUT="$(nvm alias foo/bar baz 2>&1)"
+EXPECTED_OUTPUT="Aliases in subdirectories are not supported."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to create an alias with a slash should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+EXIT_CODE="$(nvm alias foo/bar baz >/dev/null 2>&1 ; echo $?)"
+[ "$EXIT_CODE" = "1" ] || die "trying to create an alias with a slash should fail with code 1, got '$EXIT_CODE'"
+
+OUTPUT="$(nvm alias foo/ baz 2>&1)"
+EXPECTED_OUTPUT="Aliases in subdirectories are not supported."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to create an alias ending with a slash should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+EXIT_CODE="$(nvm alias foo/ baz >/dev/null 2>&1 ; echo $?)"
+[ "$EXIT_CODE" = "1" ] || die "trying to create an alias ending with a slash should fail with code 1, got '$EXIT_CODE'"
+
+OUTPUT="$(nvm alias /bar baz 2>&1)"
+EXPECTED_OUTPUT="Aliases in subdirectories are not supported."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to create an alias starting with a slash should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+EXIT_CODE="$(nvm alias /bar baz >/dev/null 2>&1 ; echo $?)"
+[ "$EXIT_CODE" = "1" ] || die "trying to create an alias starting with a slash should fail with code 1, got '$EXIT_CODE'"

test/fast/Aliases/'nvmunalias' should accept aliases when they shadow a built-in alias

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+\. ../../../nvm.sh
+
+die () { echo "$@" ; exit 1; }
+
+OUTPUT="$(nvm unalias node 2>&1)"
+EXPECTED_OUTPUT="node is a default (built-in) alias and cannot be deleted."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove a built-in alias should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+nvm alias node stable || die '`nvm alias node stable` failed'
+
+nvm unalias node || die '`nvm unalias node` failed'
+
+OUTPUT="$(nvm unalias node 2>&1)"
+EXPECTED_OUTPUT="node is a default (built-in) alias and cannot be deleted."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove a built-in alias should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"

test/fast/Aliases/'nvmunalias' should not accept aliases with names equal to built-in alias

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+\. ../../../nvm.sh
+
+die () { echo "$@" ; exit 1; }
+
+OUTPUT="$(nvm unalias node 2>&1)"
+EXPECTED_OUTPUT="node is a default (built-in) alias and cannot be deleted."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove a built-in alias should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+OUTPUT="$(nvm unalias stable 2>&1)"
+EXPECTED_OUTPUT="stable is a default (built-in) alias and cannot be deleted."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove a built-in alias should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+OUTPUT="$(nvm unalias unstable 2>&1)"
+EXPECTED_OUTPUT="unstable is a default (built-in) alias and cannot be deleted."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove a built-in alias should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+OUTPUT="$(nvm unalias iojs 2>&1)"
+EXPECTED_OUTPUT="iojs is a default (built-in) alias and cannot be deleted."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove a built-in alias should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+OUTPUT="$(nvm unalias system 2>&1)"
+EXPECTED_OUTPUT="system is a default (built-in) alias and cannot be deleted."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove a built-in alias should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"

test/fast/Aliases/'nvmunalias' should not accept aliases with slashes

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+\. ../../../nvm.sh
+
+die () { echo "$@" ; exit 1; }
+
+OUTPUT="$(nvm unalias foo/bar 2>&1)"
+EXPECTED_OUTPUT="Aliases in subdirectories are not supported."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove an alias with a slash should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+EXIT_CODE="$(nvm unalias foo/bar >/dev/null 2>&1 ; echo $?)"
+[ "$EXIT_CODE" = "1" ] || die "trying to remove an alias with a slash should fail with code 1, got '$EXIT_CODE'"
+
+OUTPUT="$(nvm unalias foo/ 2>&1)"
+EXPECTED_OUTPUT="Aliases in subdirectories are not supported."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove an alias ending with a slash should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+EXIT_CODE="$(nvm unalias foo/ >/dev/null 2>&1 ; echo $?)"
+[ "$EXIT_CODE" = "1" ] || die "trying to remove an alias ending with a slash should fail with code 1, got '$EXIT_CODE'"
+
+OUTPUT="$(nvm unalias /bar 2>&1)"
+EXPECTED_OUTPUT="Aliases in subdirectories are not supported."
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "trying to remove an alias starting with a slash should fail with '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+EXIT_CODE="$(nvm unalias /bar >/dev/null 2>&1 ; echo $?)"
+[ "$EXIT_CODE" = "1" ] || die "trying to remove an alias starting with a slash should fail with code 1, got '$EXIT_CODE'"

test/fast/Aliases/Running'nvm alias ˂aliasname˃ ˂target˃' again should change the target

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+\. ../../../nvm.sh
+\. ../../common.sh
+
+die () { echo "$@" ; exit 1; }
+
+if [ -n "$ZSH_VERSION" ]; then
+  # set clobber option in order to test that this does not produce any
+  # incompatibilities
+  setopt noclobber
+fi
+
+nvm alias test-stable-1 0.0.2 || die '`nvm alias test-stable-1 0.0.2` failed'
+
+OUTPUT="$(nvm alias test-stable-1 | strip_colors)"
+EXPECTED_OUTPUT='test-stable-1 -> 0.0.2 (-> v0.0.2)'
+echo "$OUTPUT" | \grep -F "$EXPECTED_OUTPUT" || die "nvm alias test-stable-1 0.0.2 did not set test-stable-1 to 0.0.2: got '$OUTPUT'"
+
+nvm alias test-stable-1 0.0.1 || die '`nvm alias test-stable-1 0.0.1` failed'
+
+OUTPUT="$(nvm alias test-stable-1 | strip_colors)"
+EXPECTED_OUTPUT='test-stable-1 -> 0.0.1 (-> v0.0.1)'
+echo "$OUTPUT" | \grep -F "$EXPECTED_OUTPUT" || die "nvm alias test-stable-1 0.0.1 did not set test-stable-1 to 0.0.1: got '$OUTPUT'"

test/fast/Aliases/Running'nvm alias ˂aliasname˃' should list but one alias

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+\. ../../../nvm.sh
+[ $(nvm alias test-stable-1 | wc -l) = '2' ]

test/fast/Aliases/Running'nvm alias' lists implicit aliases when they do not exist

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+\. ../../../nvm.sh
+\. ../../common.sh
+
+die () { echo "$@" ; exit 1; }
+
+NVM_ALIAS_OUTPUT=$(nvm alias | strip_colors)
+
+EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
+STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
+echo "$NVM_ALIAS_OUTPUT" | \grep -F "stable -> $EXPECTED_STABLE (-> $STABLE_VERSION) (default)" \
+  || die "nvm alias did not contain the default local stable node version; got '$NVM_ALIAS_OUTPUT'"
+
+echo "$NVM_ALIAS_OUTPUT" | \grep -F "node -> stable (-> $STABLE_VERSION) (default)" \
+  || die "nvm alias did not contain the default local stable node version under 'node'; got '$NVM_ALIAS_OUTPUT'"
+
+EXPECTED_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
+UNSTABLE_VERSION="$(nvm_version "$EXPECTED_UNSTABLE")"
+echo "$NVM_ALIAS_OUTPUT" | \grep -F "unstable -> $EXPECTED_UNSTABLE (-> $UNSTABLE_VERSION) (default)" \
+  || die "nvm alias did not contain the default local unstable node version; got '$NVM_ALIAS_OUTPUT'"
+
+EXPECTED_IOJS="$(nvm_print_implicit_alias local iojs)"
+IOJS_VERSION="$(nvm_version "$EXPECTED_IOJS")"
+echo "$NVM_ALIAS_OUTPUT" | \grep -F "iojs -> $EXPECTED_IOJS (-> $IOJS_VERSION) (default)" \
+  || die "nvm alias did not contain the default local iojs version; got '$NVM_ALIAS_OUTPUT'"