Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

New API: 'rvm package {install,uninstall} {openssl,zlib,readline,icon…

…v,etc...}'
  • Loading branch information...
commit e1e22a49afa57ddb8401707b048a43d1564cd324 1 parent ee9e3d6
Wayne E. Seguin authored
Showing with 20 additions and 13 deletions.
  1. +17 −10 scripts/cli
  2. +1 −1  scripts/manage
  3. +2 −2 scripts/{libraries → package}
27 scripts/cli
View
@@ -8,10 +8,16 @@ __rvm_parse_args() {
while [[ $# -gt 0 ]] ; do
rvm_token="$1" ; shift
case "$rvm_token" in
- fetch|version|srcdir|reset|debug|reload|implode|seppuku|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes|mono)
+ fetch|version|srcdir|reset|debug|reload|implode|seppuku|update|monitor|notes)
rvm_action=$rvm_token
;;
+ package)
+ rvm_action="$rvm_token"
+ export rvm_ruby_args="$@"
+ rvm_parse_break=1
+ ;;
+
use)
rvm_action=$rvm_token
export rvm_verbose_flag=1
@@ -392,19 +398,19 @@ rvm() {
inspect) __rvm_inspect ; result=$? ;;
implode|seppuku) __rvm_implode ; result=$? ;;
- gemdir)
- $rvm_scripts_path/gemsets gemdir
- result=$?
+ gemdir)
+ $rvm_scripts_path/gemsets gemdir
+ result=$?
;;
- ruby|gem|rake)
- $rvm_scripts_path/set $rvm_action $rvm_ruby_args
- result=$?
+ ruby|gem|rake)
+ $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+ result=$?
;;
gemset)
if [[ "$rvm_use_flag" -eq 1 ]] ; then
__rvm_gemset_select
- result=$?
+ result=$?
if [[ $result -eq 0 ]] ; then
__rvm_gemset_use
fi
@@ -420,6 +426,7 @@ rvm() {
;;
notes) $rvm_scripts_path/notes ; result=$? ;;
reload) unset rvm_loaded_flag ; rvm_reload_flag=1 ;;
+
fetch|install|uninstall|remove)
if [[ ! -z "$rvm_ruby_string" ]] ; then
$rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
@@ -432,8 +439,8 @@ rvm() {
;;
tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
- iconv|openssl|ncurses|zlib|readline|curl|mono)
- $rvm_scripts_path/libraries $rvm_action
+ package)
+ $rvm_scripts_path/package $rvm_ruby_args
result=$?
;;
2  scripts/manage
View
@@ -113,7 +113,7 @@ __rvm_install_ruby() {
if [[ "Darwin" = "$(uname)" ]] ; then
if [[ "$rvm_head_flag" = 1 ]] ; then
if [[ ! -z "$rvm_llvm_flag" ]] ; then
- $rvm_scripts_path/libraries llvm install
+ $rvm_scripts_path/package llvm install
fi
macruby_path="/usr/local/bin"
# TODO: configure & make variables should be set here.
4 scripts/libraries → scripts/package
View
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
-# ruby supporting libraries:
+# ruby dependency packages:
#
source $rvm_scripts_path/initialize
@@ -10,7 +10,7 @@ source $rvm_scripts_path/utility
action=$1 ; shift ; library=$1 ; shift ; args="$*"
if [[ -z "$action" ]] ; then
- echo "Usage: libraries {install,uninstall} {openssl,zlib,readline,iconv,ncurses}"
+ echo "Usage: package {install,uninstall} {openssl,zlib,readline,iconv,ncurses}"
fi
install_package() {
Please sign in to comment.
Something went wrong with that request. Please try again.