Adjust where rvmrc gets loaded for package managers.

scripts/cli

@@ -433,11 +433,10 @@ rvm() {
     tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;
 
     iconv|openssl|ncurses|zlib|readline|curl|mono)
-      __rvm_${rvm_action}_install
+      $rvm_scripts_path/libraries $rvm_action
       result=$?
     ;;
 
-
     error)
       $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
       __rvm_pushpop

scripts/install

@@ -35,11 +35,10 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-__rvm_load_rvmrc
-
-if [[ -z "$rvm_prefix" ]] ; then 
+if [[ -z "$rvm_prefix" ]] ; then
+  __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_prefix="/usr/local/" 
+    rvm_prefix="/usr/local/"
   else
     rvm_prefix="$HOME/."
   fi

scripts/libraries

@@ -3,7 +3,14 @@
 #
 # ruby supporting libraries:
 #
-__rvm_install_package() {
+
+action=$1 ; shift ; library=$1 ; shift ; args="$*"
+
+if [[ -z "$action" ]] ; then
+  echo "Usage: libraries {install,uninstall} {openssl,zlib,readline,iconv,ncurses}"
+fi
+
+install_package() {
 
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
 
@@ -41,7 +48,7 @@ __rvm_install_package() {
 
 }
 
-__rvm_readline_install() {
+readline() {
   package="readline" ; archive_format="tar.gz"
   package_url="ftp://ftp.gnu.org/gnu/readline"
   for version in 5.2 6.0 ; do
@@ -50,19 +57,19 @@ __rvm_readline_install() {
   done
 }
 
-__rvm_iconv_install() {
+iconv() {
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
   package_url="http://ftp.gnu.org/pub/gnu/libiconv"
   __rvm_install_package
 }
 
-__rvm_curl_install() {
+curl() {
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
   package_url="http://curl.haxx.se/download"
   __rvm_install_package
 }
 
-__rvm_openssl_install() {
+openssl() {
   if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
     export openssl_os="os/compiler darwin64-x86_64-cc"
   else
@@ -74,40 +81,40 @@ __rvm_openssl_install() {
   __rvm_install_package
 }
 
-__rvm_zlib_install() {
+zlib() {
   package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
   package_url="http://www.zlib.net"
   __rvm_install_package
 }
 
-__rvm_ncurses_install() {
+ncurses() {
   package_url="ftp://invisible-island.net/ncurses/ncurses"
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
   __rvm_install_package
 }
 
-__rvm_pkgconfig_install() {
+pkgconfig() {
   package_url="http://pkgconfig.freedesktop.org/releases"
   package="pkg-config" ; version="0.23" archive_format="tar.gz"
   __rvm_install_package
 }
 
-__rvm_gettext_install() {
+gettext() {
   package_url="ftp://ftp.gnu.org/pub/gnu/gettext"
   package="gettext" ; version="0.17" ; archive_format="tar.gz"
   __rvm_install_package
 }
 
-__rvm_glib_install() {
+glib() {
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
   package_url="http://ftp.gnome.org/pub/gnome/sources/glib/2.23"
   configure="CC=\"cc -L$rvm_usr_path/lib\" ./configure --prefix=$rvm_usr_path"
 
   __rvm_install_package
 }
 
-__rvm_mono_install() {
+mono() {
   package="mono" ; version="2.6.1" ; archive_format="tar.bz2"
   packge_url="http://ftp.novell.com/pub/mono/sources/mono/"
   __rvm_mono_env
@@ -116,7 +123,7 @@ __rvm_mono_install() {
   __rvm_glib_install
 }
 
-__rvm_llvm_install() {
+llvm() {
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
@@ -129,3 +136,7 @@ __rvm_llvm_install() {
   fi
   __rvm_pushpop
 }
+
+
+${action}
+