Merge d8c36093c7a7b0a90cdae65fd95cec36dc92563b 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:04:06 +09:00 · 2024-07-06 10:29:55 -05:00 · 2018-05-04 14:17:15 +02:00
2 changed files with 3 additions and 3 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
@ -422,10 +422,10 @@ nvm_do_install() {
  local PROFILE_INSTALL_DIR
  PROFILE_INSTALL_DIR="$(nvm_install_dir | command sed "s:^$HOME:\$HOME:")"

-  SOURCE_STR="\\nexport NVM_DIR=\"${PROFILE_INSTALL_DIR}\"\\n[ -s \"\$NVM_DIR/nvm.sh\" ] && \\. \"\$NVM_DIR/nvm.sh\"  # This loads nvm\\n"
+  SOURCE_STR="\\nexport NVM_DIR=\"${PROFILE_INSTALL_DIR}\"\\n[ ! -s \"\$NVM_DIR/nvm.sh\" ] || \\. \"\$NVM_DIR/nvm.sh\"  # This loads nvm\\n"

  # shellcheck disable=SC2016
-  COMPLETION_STR='[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion\n'
+  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
Author	SHA1	Message	Date
Günter Grodotzki	6b0be11f0d	Merge d8c36093c7a7b0a90cdae65fd95cec36dc92563b into 762f9ef9d17623b45095e8ca1a996c8928f3f424	2024-07-07 21:04:06 +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
Gunter Grodotzki	d8c36093c7	Do not fail .bashrc if nvm is not installed	2018-05-04 14:17:15 +02:00