scripts/rvm in rvm-0.1.47 vs scripts/rvm in rvm-1.0.0
- old
+ new
@@ -10,11 +10,11 @@
unset rvm_reload_flag
if [[ -z "$rvm_ignore_rvmrc" ]]; then
for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
if [[ -f "$rvmrc" ]] ; then
- if grep -q '^\s*rvm .*$' $rvmrc ; then
+ if \grep -q '^\s*rvm .*$' $rvmrc ; then
printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
return 1
else
source "$rvmrc"
fi
@@ -38,11 +38,11 @@
rvm_prefix="$HOME/."
fi
fi
# Fix rvm_prefix changes.
- echo "$rvm_prefix" | grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
+ echo "$rvm_prefix" | \grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
rvm_prefix_needs_trailing_slash="$?"
if [[ "$rvm_prefix" = "/usr/local" || "$rvm_prefix_needs_trailing_slash" = "0" ]]; then
rvm_prefix="$rvm_prefix/"
fi
unset rvm_prefix_needs_trailing_slash
@@ -66,10 +66,10 @@
rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | \tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
alias rvm-restart="source '${rvm_path}/scripts/rvm'"
- if ! command -v ruby >/dev/null 2>&1 || command -v ruby | grep -v rvm >/dev/null ; then
+ if ! command -v ruby >/dev/null 2>&1 || command -v ruby | \grep -v rvm >/dev/null ; then
[[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
fi
else
printf "\n\$rvm_path is not set. rvm cannot load."
fi