rvm 0.0.80 → 0.0.81

data/README

@@ -26,14 +26,13 @@ Action
   tests     - runs 'rake test' across selected ruby versions
   specs     - runs 'rake spec' across selected ruby versions
 
-  gemsync   - sync gems from a specified version to current version
   gemdir    - switch to gem directory for installation (new login shell)
   srcdir    - switch to src directory for the current ruby installation
 
 Implementation
 
   * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
-  jruby     - jRuby
+  jruby     - JRuby
   rbx       - rubinius
   ree       - ruby Enterprise Edition
   mput      - shyouhei(mput)'s github repository

data/install

@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
 
-rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
-if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
-if [[ "root" = "$(whoami)" ]] ; then
-  rvm_path="${rvm_path:-/usr/local/rvm}"
-  rc_files="$rc_files /etc/profile /etc/zshenv"
-else
-  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-  rvm_path="${rvm_path:-$HOME/.rvm}"
+if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
+
+if [[ -z "$rvm_path" ]] ; then
+  if [[ "root" = "$(whoami)" ]] ; then
+    rvm_path="${rvm_path:-/usr/local/rvm}"
+  else
+    rvm_path="${rvm_path:-$HOME/.rvm}"
+  fi
 fi
 
+source scripts/initialize
+
 #
 # Setup
 #
@@ -21,8 +25,8 @@ if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0)\n\n    shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Installing rvm to $rvm_path ..."
+echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
+echo -e "\n    Installing to $rvm_path..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -47,15 +51,15 @@ ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
 #
 # RC Files
 #
-if [[ -z "$rvm_loaded_flag" ]] ; then
-  for rcfile in $(echo $rc_files) ; do
-    if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -z "$(awk '/\.rvm\/scripts\/rvm/' $rcfile)" ]] ; then
-      echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    fi
-  done
-fi
+for rcfile in $(echo $rvm_rc_files) ; do
+  if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+  if [[ -z "$(awk "/$(echo "$rvm_path/scripts/rvm" | sed 's#/#\\/#g')/" $rcfile)" ]] ; then
+    echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] && [[ "\$rvm_loaded_flag" -le 0 ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+    echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] && [[ "\$rvm_loaded_flag" != "1" ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+  else
+    : # it exists... remove it and append at the end
+  fi
+done
 
 if [[ "root" = "$(whoami)" ]] ; then
   ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
@@ -66,7 +70,7 @@ fi
 # System Checks
 #
 system="$(uname)"
-echo -e "\n    $(tput setaf 3)NOTES: $(tput sgr0)\n"
+echo -e "\n$(tput setaf 2)Notes: $(tput sgr0)\n"
 if [[ "Linux" = "$system" ]] ; then
   rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
   rvm_emerge_binary="$(which emerge 2> /dev/null)"
@@ -74,44 +78,42 @@ if [[ "Linux" = "$system" ]] ; then
   rvm_yum_binary="$(which yum 2> /dev/null)"
 
   if [[ ! -z "$rvm_apt_get_binary" ]] ; then
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
-    echo -e "      $item For ree (if you wish to use it) you will need:"
-    echo -e "        $ aptitude install libreadline5-dev libssl-dev bison"
-    echo -e "      $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "        $ aptitude install libxml2-dev"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "      $ aptitude install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
+    echo -e "      $ aptitude install libxml2-dev"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   elif [[ ! -z "$rvm_pacman_binary" ]] ; then
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        $ pacman -Sy jdk jre"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      $ pacman -Sy jdk jre"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
-    echo -e "      $item For ree (if you wish to use it) you will need:"
-    echo -e "        $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "      $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
 
   else
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        The SUN java runtime environment and development kit."
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      The SUN java runtime environment and development kit."
   fi
 elif [[ "Darwin" = "$system"  ]] ; then
-  echo -e "      $item Be sure that you have XCode Tools installed in order to use rvm."
-  echo -e "      $item If you intend on installing MacRuby you must install LLVM first."
+  echo -e "    $item Be sure that you have XCode Tools installed in order to use rvm."
+  echo -e "    $item If you intend on installing MacRuby you must install LLVM first."
 fi
 
-echo -e "      $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
-echo -e "      $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "      $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
+echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
+echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+echo -e "    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
-echo -e "\n    \033[0;33mRTFM: $(tput sgr0) http://rvm.beginrescueend.com/ \n"
+echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-source $rvm_path/scripts/rvm
-rvm -v
-echo
+$rvm_path/bin/rvm -v
 
 exit 0

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 80
+:patch: 81

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.80"
+  s.version = "0.0.81"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.files = [
     "LICENCE",
      "README",
-     "binscripts/gemsync",
      "binscripts/rvm-prompt",
      "config/db",
      "examples/rvmrc",
@@ -36,11 +35,17 @@ Gem::Specification.new do |s|
      "scripts/cli",
      "scripts/color",
      "scripts/completion",
+     "scripts/db",
+     "scripts/fetch",
      "scripts/functions",
      "scripts/gems",
+     "scripts/initialize",
      "scripts/install",
      "scripts/irbrc",
      "scripts/irbrc.rb",
+     "scripts/log",
+     "scripts/match",
+     "scripts/monitor",
      "scripts/ruby-installer",
      "scripts/rvm",
      "scripts/rvm-install",

data/scripts/cli

@@ -17,7 +17,7 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|gemsync|update|iconv|curl|openssl|ncurses|zlib|readline)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline)
         rvm_action=$rvm_token
       ;;
 
@@ -47,7 +47,7 @@ __rvm_parse_args() {
         rvm_ruby_interpreter="$rvm_token"
         rvm_ruby_string="$rvm_token"
         rvm_action="${rvm_action:-use}"
-        if match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
+        if $rvm_scripts_path/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
       ;;
 
       gems|gemset)
@@ -72,22 +72,6 @@ __rvm_parse_args() {
         eval "rvm_${rvm_token}_flag=1"
       ;;
 
-      gemdup)
-        rvm_action=$rvm_token
-        if [[ -z "$1" ]] ; then
-          rvm_ruby_interpreter="default"
-        elif [[ "system" = "$1" ]] ; then
-          rvm_ruby_interpreter=$1 ; shift
-        elif [[ "user" = "$1" ]] ; then
-          rvm_ruby_interpreter=$1 ; shift
-        elif [[ "default" = "$1" ]] ; then
-          rvm_ruby_interpreter=$1 ; shift
-        else
-          rvm_ruby_interpreter=$1 ; shift
-          rvm_ruby_version=$2 ; shift
-        fi
-      ;;
-
       -S|-e)
         rvm_action="ruby"
         rvm_ruby_args="$rvm_token $@"
@@ -113,10 +97,10 @@ __rvm_parse_args() {
             rvm_parse_break=1
           fi
         else
-          if match "$1" "^-" ; then
+          if $rvm_scripts_path/match "$1" "^-" ; then
             unset rvm_ruby_version
           else
-            if match "$1" "^[0-9]" ; then
+            if $rvm_scripts_path/match "$1" "^[0-9]" ; then
               rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
               unset rvm_ruby_interpreter
             else
@@ -248,7 +232,6 @@ __rvm_parse_args() {
 
       --install)            rvm_install_on_use_flag=1          ;;
       -h|--help|usage|help) rvm_action=help                    ;;
-      --prefix)             rvm_prefix_path="$1"       ; shift ;;
       -G|--gems)            rvm_gem_path="$1"          ; shift ;;
       --source)             rvm_src_path="$1"          ; shift ;;
       --archives)           rvm_archives_path="$1"     ; shift ;;
@@ -266,6 +249,7 @@ __rvm_parse_args() {
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose)
         eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1"
+        if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;
 
       reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
@@ -280,7 +264,7 @@ __rvm_parse_args() {
       *)
         if [[ ! -z "$rvm_token" ]] ; then
           if [[ "gems" = "$rvm_action" ]] ; then
-            if match "$rvm_token" "^.+%.+$" ; then
+            if $rvm_scripts_path/match "$rvm_token" "^.+%.+$" ; then
               rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
               rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
             elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
@@ -295,19 +279,19 @@ __rvm_parse_args() {
             if [[ -z "$rvm_action" ]] ; then
               rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
             fi
-          elif match "$rvm_token" "^.+%.+$" ; then
+          elif $rvm_scripts_path/match "$rvm_token" "^.+%.+$" ; then
             rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
             rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
-          elif match "$rvm_token" "-" ; then
+          elif $rvm_scripts_path/match "$rvm_token" "-" ; then
             rvm_ruby_string="$rvm_token"
-          elif match "$rvm_token" "^[0-9].[0-9]" ; then
+          elif $rvm_scripts_path/match "$rvm_token" "^[0-9].[0-9]" ; then
             rvm_ruby_string="$rvm_token"
             rvm_action="${rvm_action:-use}"
-          elif match "$rvm_token" "^ree" ; then
+          elif $rvm_scripts_path/match "$rvm_token" "^ree" ; then
             rvm_ruby_string="$rvm_token"
             rvm_action="${rvm_action:-use}"
           else
-            if match "$rvm_token" "\.rb$" ; then # we have a specified ruby script
+            if $rvm_scripts_path/match "$rvm_token" "\.rb$" ; then # we have a specified ruby script
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
               if [[ -z "$rvm_action" ]] ; then
@@ -336,7 +320,6 @@ __rvm_parse_args() {
 }
 
 rvm() {
-
   trap '__rvm_cleanup_variables ; rm -rf "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
 
   # Check that this is the current version.
@@ -357,7 +340,6 @@ rvm() {
   case "$rvm_action" in
     use)           __rvm_use              ; result=$?  ;;
     gemdir)        __rvm_gemdir           ; result=$?  ;;
-    gemdup)        __rvm_gemdup           ; result=$?  ;;
     srcdir)        __rvm_source_dir       ; result=$?  ;;
     list)          __rvm_list             ; result=$?  ;;
     version)       __rvm_version          ; result=$?  ;;
@@ -381,11 +363,6 @@ rvm() {
       result=$?
     ;;
 
-    gemsync)
-      rvm_source_gem_path=$(__rvm_select ; echo $rvm_ruby_gem_home)
-      __rvm_gem_sync
-    ;;
-
     info|debug)
       __rvm_version
       __rvm_info
@@ -393,14 +370,14 @@ rvm() {
     ;;
 
     error)
-      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )"
+      $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
       __rvm_pushpop
       result=1;
     ;;
 
     *)
       if [[ ! -z "$rvm_action" ]] ; then
-        __rvm_log "fail"  "unknown action '$rvm_action'"
+        $rvm_scripts_path/log "fail"  "unknown action '$rvm_action'"
       else
         __rvm_usage
       fi

data/scripts/color

@@ -1,52 +1,49 @@
 #!/usr/bin/env bash
 
-__color() {
-  case "$1" in
-    # regular colors
-    black)    tput setaf 0 ;;
-    red)      tput setaf 1 ;;
-    green)    tput setaf 2 ;;
-    yellow)   tput setaf 3 ;;
-    blue)     tput setaf 4 ;;
-    magenta)  tput setaf 5 ;;
-    cyan)     tput setaf 6 ;;
-    white)    tput setaf 7 ;;
+case "$1" in
+  # regular colors
+  black)    tput setaf 0 ;;
+  red)      tput setaf 1 ;;
+  green)    tput setaf 2 ;;
+  yellow)   tput setaf 3 ;;
+  blue)     tput setaf 4 ;;
+  magenta)  tput setaf 5 ;;
+  cyan)     tput setaf 6 ;;
+  white)    tput setaf 7 ;;
 
-    # emphasized (bolded) colors
-    eblack)   tput bold ; tput setaf 0 ;;
-    ered)     tput bold ; tput setaf 1 ;;
-    egreen)   tput bold ; tput setaf 2 ;;
-    eyellow)  tput bold ; tput setaf 3 ;;
-    eblue)    tput bold ; tput setaf 4 ;;
-    emagenta) tput bold ; tput setaf 5 ;;
-    ecyan)    tput bold ; tput setaf 6 ;;
-    ewhite)   tput bold ; tput setaf 7 ;;
+  # emphasized (bolded) colors
+  eblack)   tput bold ; tput setaf 0 ;;
+  ered)     tput bold ; tput setaf 1 ;;
+  egreen)   tput bold ; tput setaf 2 ;;
+  eyellow)  tput bold ; tput setaf 3 ;;
+  eblue)    tput bold ; tput setaf 4 ;;
+  emagenta) tput bold ; tput setaf 5 ;;
+  ecyan)    tput bold ; tput setaf 6 ;;
+  ewhite)   tput bold ; tput setaf 7 ;;
 
-    # underlined colors
-    ublack)   set smul unset rmul ; tput setaf 0 ;;
-    ured)     set smul unset rmul ; tput setaf 1 ;;
-    ugreen)   set smul unset rmul ; tput setaf 2 ;;
-    uyellow)  set smul unset rmul ; tput setaf 3 ;;
-    ublue)    set smul unset rmul ; tput setaf 4 ;;
-    umagenta) set smul unset rmul ; tput setaf 5 ;;
-    ucyan)    set smul unset rmul ; tput setaf 6 ;;
-    uwhite)   set smul unset rmul ; tput setaf 7 ;;
+  # underlined colors
+  ublack)   set smul unset rmul ; tput setaf 0 ;;
+  ured)     set smul unset rmul ; tput setaf 1 ;;
+  ugreen)   set smul unset rmul ; tput setaf 2 ;;
+  uyellow)  set smul unset rmul ; tput setaf 3 ;;
+  ublue)    set smul unset rmul ; tput setaf 4 ;;
+  umagenta) set smul unset rmul ; tput setaf 5 ;;
+  ucyan)    set smul unset rmul ; tput setaf 6 ;;
+  uwhite)   set smul unset rmul ; tput setaf 7 ;;
 
-    # background colors
-    bblack)   tput setab 0 ;;
-    bred)     tput setab 1 ;;
-    bgreen)   tput setab 2 ;;
-    byellow)  tput setab 3 ;;
-    bblue)    tput setab 4 ;;
-    bmagenta) tput setab 5 ;;
-    bcyan)    tput setab 6 ;;
-    bwhite)   tput setab 7 ;;
-
-    # Defaults
-    default)  tput setaf 9 ;;
-    bdefault) tput setab 9 ;;
-    none)     tput sgr0    ;;
-    *)        tput sgr0    # Reset
-  esac
-}
+  # background colors
+  bblack)   tput setab 0 ;;
+  bred)     tput setab 1 ;;
+  bgreen)   tput setab 2 ;;
+  byellow)  tput setab 3 ;;
+  bblue)    tput setab 4 ;;
+  bmagenta) tput setab 5 ;;
+  bcyan)    tput setab 6 ;;
+  bwhite)   tput setab 7 ;;
 
+  # Defaults
+  default)  tput setaf 9 ;;
+  bdefault) tput setab 9 ;;
+  none)     tput sgr0    ;;
+  *)        tput sgr0    # Reset
+esac

data/scripts/completion

@@ -41,7 +41,7 @@ _rvm ()
 	[[ "$expansion" ]] && command="$expansion"
 
 	case "$command" in
-      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use|gemsync)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use)
       ;;
 
       rm|remove)
@@ -56,13 +56,6 @@ _rvm ()
       gemdir)
       ;;
 
-      gemdup)
-        "system"
-        "user"
-        "default"
-      ;;
-
-
       1.8|1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9|1.9.1|1.9.2)
       ;;
 
@@ -81,7 +74,6 @@ _rvm ()
       ;;
 
       --install)         rvm_install_on_use_flag=1         ;;
-      --prefix)          rvm_prefix_path="$1"      ; shift ;;
       -G|--gems)         rvm_gem_path="$1"         ; shift ;;
       --source)          rvm_src_path="$1"         ; shift ;;
       --archives)        rvm_archives_path="$1"    ; shift ;;
@@ -143,7 +135,6 @@ function _rvm {
     use)        __rvm_use              ; result=$? ;;
     gemdir)     __rvm_gem-dir          ; result=$? ;;
     srcdir)     __rvm_src-dir          ; result=$? ;;
-    gemdup)     __rvm_gem-dup          ; result=$? ;;
     list)       __rvm_list             ; result=$? ;;
     version)    __rvm_version          ; result=$? ;;
     reset)      __rvm_reset            ; result=$? ;;
@@ -157,33 +148,22 @@ function _rvm {
     bench|benchmark)  __rvm_benchmark  ; result=$? ;;
     rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
 
-    gemsync)
-      result=0
-      rvm_source_gem_path="$(__rvm_select ; echo $rvm_gem_home)"
-      __rvm_gem_sync
-    ;;
-
     tests|specs)
       rvm_summary_flag=1
-      rvm_action="rake"
-      __rvm_do
     ;;
 
     info|debug)
-      __rvm_version
-      __rvm_info
-      if [[ "debug" = "$rvm_action" ]] ; then __rvm_debug ; fi
       result=0
     ;;
 
     error)
-      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )"
+      $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
       __rvm_pushpop
       result=1;
     ;;
     *)
       if [[ ! -z "$rvm_action" ]] ; then
-        __rvm_log "fail"  "unknown action '$rvm_action'"
+        $rvm_scripts_path/log "fail"  "unknown action '$rvm_action'"
       else
         __rvm_usage
       fi