Merge 61cb9f7cdba14aa1c0276082aaf122716a3e8021 into 762f9ef9d17623b45095e8ca1a996c8928f3f424

[Tests] only install python 2.7 if not already installed
See ee6f7667 / #3067
2025-08-16 10:43:42 +00:00 · 2024-07-07 21:05:55 +09:00 · 2024-07-06 10:29:55 -05:00 · 2019-12-05 19:30:26 -08:00
2 changed files with 5 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -32,7 +32,7 @@ before_install:
  - zsh  --version
  - dpkg -s dash | grep ^Version | awk '{print $2}'
  # install python
-  - pyenv install 2.7.18
+  - pyenv local 2.7.18 || pyenv install 2.7.18
  - pyenv local 2.7.18 || echo 'pyenv failed'
  - python -V
 install:
--- a/install.sh
+++ b/install.sh
@ -428,7 +428,10 @@ nvm_do_install() {
  COMPLETION_STR='[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion\n'
  BASH_OR_ZSH=false

-  if [ -z "${NVM_PROFILE-}" ] ; then
+  if [ "${PROFILE-}" = '/dev/null' ] ; then
+    # the user has specifically requested NOT to have nvm touch their profile
+    echo
+  elif [ -z "${NVM_PROFILE-}" ] ; then
    local TRIED_PROFILE
    if [ -n "${PROFILE}" ]; then
      TRIED_PROFILE="${NVM_PROFILE} (as defined in \$PROFILE), "
Author	SHA1	Message	Date
Wes Todd	1dd53c6f93	Merge 61cb9f7cdba14aa1c0276082aaf122716a3e8021 into 762f9ef9d17623b45095e8ca1a996c8928f3f424	2024-07-07 21:05:55 +09:00
Jordan Harband	762f9ef9d1	[Tests] only install python 2.7 if not already installed See ee6f7667 / #3067	2024-07-06 10:29:55 -05:00
Wes Todd	61cb9f7cdb	[Fix] `install.sh`: do not log when user has requested no profile modifications	2019-12-05 19:30:26 -08:00