Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

only call the command if it is loaded, first install should not error.

  • Loading branch information...
commit dc43ca6c9482d3be823db013345c2b93499f6e01 1 parent d8ad73e
Wayne E. Seguin authored
Showing with 4 additions and 4 deletions.
  1. +2 −2 scripts/functions/installer
  2. +1 −1  scripts/rvm
  3. +1 −1  scripts/selector
4 scripts/functions/installer
View
@@ -6,8 +6,8 @@ install_setup()
export HOME="${HOME%%+(\/)}" # Remove trailing slashes if they exist on HOME
- case "$(uname -s)" in
- AIX) name_opt=-name ;;
+ case "$MACHTYPE" in
+ *aix*) name_opt=-name ;;
*) name_opt=-iname ;;
esac
2  scripts/rvm
View
@@ -133,7 +133,7 @@ then
unset rvm_prefix_needs_trailing_slash rvm_rc_files rvm_gems_cache_path rvm_gems_path rvm_project_rvmrc_default rvm_gemset_separator
fi
-if [[ -t 0 ]] # && "*screen*" =~ $TERM ]]
+if [[ -t 0 ]] && command -v __rvm_project_rvmrc >/dev/null 2>&1
then
# Reload the rvmrc, use promptless ensuring shell processes does not
# prompt if .rvmrc trust value is not stored.
2  scripts/selector
View
@@ -426,7 +426,7 @@ __rvm_use()
rvm_log "Using ${GEM_HOME/${rvm_gemset_separator:-'@'}/ with gemset }"
fi
- new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:${rvm_bin_path}:$(__rvm_remove_rvm_from_path printf "$PATH")"
+ new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:${rvm_bin_path}:$(__rvm_remove_rvm_from_path ;printf "$PATH")"
fi
# Export ruby string and gem set me for extrenal scripts to take advantage of them.
Please sign in to comment.
Something went wrong with that request. Please try again.