utility in rvm-1.0.19

- old
+ new

@@ -770,14 +770,16 @@
 __rvm_update()
 {
   (
     builtin cd "$rvm_path"
 
+    # TODO:
     if [[ ${rvm_head_flag:-0} -eq 1 || ${rvm_self_flag:-0} -eq 1 \
       || "update" = "${rvm_action:-""}" || ${rvm_update_flag:-0} -eq 1 ]] ; then
-      __rvm_version
-      __rvm_update_rvm
+    "$rvm_path/scripts/log" "warn" \
+        "'rvm update --head' is depreciated, use 'rvm get head' instead"
+      "$rvm_path/scripts/get" head
     fi
 
     if [[ ${rvm_bin_flag:-0} -eq 1 ]] ; then
       __rvm_bin_scripts
     fi
@@ -791,60 +793,10 @@
     rvm_ruby_revision rvm_bin_flag rvm_rubygems_flag
 
   return 0
 }
 
-# Update rvm using rubygems
-# If --head was specified, update from git repository master branch.
-__rvm_update_rvm()
-{
-  (
-    if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}" ]] ; then
-      \mkdir -p "${rvm_src_path:-"$rvm_path/src"}"
-    fi
-
-    builtin cd "${rvm_src_path:-"$rvm_path/src"}"
-
-    if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
-
-      if [[ -d "${rvm_src_path:-"$rvm_path/src"}/rvm/.git" ]] ; then
-
-        builtin cd "${rvm_src_path:-"$rvm_path/src"}/rvm/" && \
-          git pull origin master && \
-          ./scripts/install
-
-      else
-
-        builtin cd "${rvm_src_path:-"$rvm_path/src"}" && \
-          ( git clone http://github.com/wayneeseguin/rvm.git || \
-          git clone --depth 1 git://github.com/wayneeseguin/rvm.git ) && \
-          builtin cd rvm/ && ./scripts/install
-      fi
-    else
-      version_url="http://rvm.beginrescueend.com/releases/stable-version.txt"
-
-      stable_version="$(curl -s $version_url)"
-
-      __rvm_run "fetch" \
-        "$rvm_path/scripts/fetch 'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" \
-        "fetching rvm-${stable_version}.tar.gz"
-
-      __rvm_run "extract" \
-        "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/rvm-${stable_version}.tar.gz\" | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" \
-        "Extracting rvm-${stable_version}.tar.gz ..."
-
-      __rvm_run "install" \
-        "builtin cd ${rvm_src_path:-"$rvm_path/src"}/rvm-${stable_version}/; ./install" \
-        "Installing rvm-${stable_version}..."
-    fi
-  )
-
-  rvm_hook="after_update" ; source "$rvm_path/scripts/hook"
-
-  return 0
-}
-
 __rvm_reboot()
 {
   "$rvm_path/scripts/log" "warn" \
     "Do you wish to reboot rvm?\
     \n('yes', or 'no')> "
@@ -866,11 +818,11 @@
       if [[ -d "$rvm_path" ]] ; then \rm -rf "$rvm_path/" ; fi
     fi
 
     gem install rvm $rvm_gem_options
 
-    __rvm_update_rvm
+    "$rvm_path/scripts/get" latest
 
     source "$rvm_path/scripts/rvm"
   else
     "$rvm_path/scripts/log" "info" "Carry on then..."
   fi
@@ -970,15 +922,15 @@
   # This is only an issue with Darwin :/
   if [[ "Darwin" = "$(uname)" ]] ; then
     # \ls /usr/lib/gcc/x86_64-apple-darwin10
 
     # Set the build & host type
-    if [[ "Power Macintosh" = "$(sysctl -n hw.machine)" ]] ; then
+    if [[ "Power Macintosh" = "$(/usr/sbin/sysctl -n hw.machine)" ]] ; then
 
       : # Do nothing ?
 
-    elif [[ "$(sysctl -n hw.cpu64bit_capable)" = 1 \
-      || "$(sysctl -n hw.optional.x86_64)" = 1 ]] ; then
+    elif [[ "$(/usr/sbin/sysctl -n hw.cpu64bit_capable)" = 1 \
+      || "$(/usr/sbin/sysctl -n hw.optional.x86_64)" = 1 ]] ; then
 
       #   64 bit capable
 
       if [[ "-arch x86_64" = "${rvm_archflags:-""}" ]] ; then
 