Skip to content
This repository
Browse code

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

…v,etc...}'
  • Loading branch information...
commit e1e22a49afa57ddb8401707b048a43d1564cd324 1 parent ee9e3d6
Wayne E. Seguin authored
27 scripts/cli
@@ -8,10 +8,16 @@ __rvm_parse_args() {
8 8 while [[ $# -gt 0 ]] ; do
9 9 rvm_token="$1" ; shift
10 10 case "$rvm_token" in
11   - fetch|version|srcdir|reset|debug|reload|implode|seppuku|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes|mono)
  11 + fetch|version|srcdir|reset|debug|reload|implode|seppuku|update|monitor|notes)
12 12 rvm_action=$rvm_token
13 13 ;;
14 14
  15 + package)
  16 + rvm_action="$rvm_token"
  17 + export rvm_ruby_args="$@"
  18 + rvm_parse_break=1
  19 + ;;
  20 +
15 21 use)
16 22 rvm_action=$rvm_token
17 23 export rvm_verbose_flag=1
@@ -392,19 +398,19 @@ rvm() {
392 398 inspect) __rvm_inspect ; result=$? ;;
393 399 implode|seppuku) __rvm_implode ; result=$? ;;
394 400
395   - gemdir)
396   - $rvm_scripts_path/gemsets gemdir
397   - result=$?
  401 + gemdir)
  402 + $rvm_scripts_path/gemsets gemdir
  403 + result=$?
398 404 ;;
399 405
400   - ruby|gem|rake)
401   - $rvm_scripts_path/set $rvm_action $rvm_ruby_args
402   - result=$?
  406 + ruby|gem|rake)
  407 + $rvm_scripts_path/set $rvm_action $rvm_ruby_args
  408 + result=$?
403 409 ;;
404 410 gemset)
405 411 if [[ "$rvm_use_flag" -eq 1 ]] ; then
406 412 __rvm_gemset_select
407   - result=$?
  413 + result=$?
408 414 if [[ $result -eq 0 ]] ; then
409 415 __rvm_gemset_use
410 416 fi
@@ -420,6 +426,7 @@ rvm() {
420 426 ;;
421 427 notes) $rvm_scripts_path/notes ; result=$? ;;
422 428 reload) unset rvm_loaded_flag ; rvm_reload_flag=1 ;;
  429 +
423 430 fetch|install|uninstall|remove)
424 431 if [[ ! -z "$rvm_ruby_string" ]] ; then
425 432 $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
@@ -432,8 +439,8 @@ rvm() {
432 439 ;;
433 440 tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
434 441
435   - iconv|openssl|ncurses|zlib|readline|curl|mono)
436   - $rvm_scripts_path/libraries $rvm_action
  442 + package)
  443 + $rvm_scripts_path/package $rvm_ruby_args
437 444 result=$?
438 445 ;;
439 446
2  scripts/manage
@@ -113,7 +113,7 @@ __rvm_install_ruby() {
113 113 if [[ "Darwin" = "$(uname)" ]] ; then
114 114 if [[ "$rvm_head_flag" = 1 ]] ; then
115 115 if [[ ! -z "$rvm_llvm_flag" ]] ; then
116   - $rvm_scripts_path/libraries llvm install
  116 + $rvm_scripts_path/package llvm install
117 117 fi
118 118 macruby_path="/usr/local/bin"
119 119 # TODO: configure & make variables should be set here.
4 scripts/libraries → scripts/package
... ... @@ -1,7 +1,7 @@
1 1 #!/usr/bin/env bash
2 2
3 3 #
4   -# ruby supporting libraries:
  4 +# ruby dependency packages:
5 5 #
6 6
7 7 source $rvm_scripts_path/initialize
@@ -10,7 +10,7 @@ source $rvm_scripts_path/utility
10 10 action=$1 ; shift ; library=$1 ; shift ; args="$*"
11 11
12 12 if [[ -z "$action" ]] ; then
13   - echo "Usage: libraries {install,uninstall} {openssl,zlib,readline,iconv,ncurses}"
  13 + echo "Usage: package {install,uninstall} {openssl,zlib,readline,iconv,ncurses}"
14 14 fi
15 15
16 16 install_package() {

0 comments on commit e1e22a4

Please sign in to comment.
Something went wrong with that request. Please try again.