scripts/rvm in rvm-1.0.1 vs scripts/rvm in rvm-1.0.2
- old
+ new
@@ -4,10 +4,11 @@
# http://rvm.beginrescueend.com
# http://github.com/wayneeseguin/rvm
rvm_reload_flag="${rvm_reload_flag:-0}"
rvm_loaded_flag="${rvm_loaded_flag:-0}"
+
if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
unset rvm_reload_flag
if [[ -z "$rvm_ignore_rvmrc" ]]; then
for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
@@ -57,11 +58,10 @@
source "$rvm_scripts_path/utility"
source "$rvm_scripts_path/initialize"
source "$rvm_scripts_path/version"
source "$rvm_scripts_path/selector"
source "$rvm_scripts_path/cli"
- source "$rvm_scripts_path/manpages"
source "$rvm_scripts_path/cd"
source "$rvm_scripts_path/override_gem"
rvm_loaded_flag=1
@@ -72,13 +72,13 @@
if ! command -v ruby >/dev/null 2>&1 || command -v ruby | \grep -v rvm >/dev/null ; then
if [[ -s "$rvm_environments_path/default" ]] ; then
source "$rvm_environments_path/default"
fi
fi
-
+
# Makes sure rvm_bin_path is in PATH atleast once.
__rvm_conditionally_add_bin_path
-
+
else
printf "\n\$rvm_path is not set. rvm cannot load."
fi
fi