Unverified Commit 12b17e6e authored by Koichiro Iwao's avatar Koichiro Iwao
Browse files

rbenv-install: show the short list by default 

As suggested by @eregon, now we have "-l/--list" option for the short
list of versions. Behaviour of `ruby-build --definitions` is kept as
before for compatibility.

rbenv-install:
  -L/--list-all       full list
  -l/--list           short list

ruby-build:
  -d/--definitions    full list
  -l/--list           short list
parent 45ec7a7c

bin/rbenv-install

+7 −7
Original line number Diff line number Diff line
@@ -7,9 +7,8 @@ 
#        rbenv install -l|--list

#        rbenv install --version

#

#   -l/--list          List all available versions

#   -L/--list-exclude-eol

#                      List available versions excluding EoL'ed

#   -l/--list          List available versions except EoL'ed versions

#   -L/--list-all      List all available versions

#   -f/--force         Install even if the version appears to be installed already

#   -s/--skip-existing Skip if the version appears to be installed already

#
@@ -40,7 +39,7 @@ shopt -u nullglob 
# Provide rbenv completions

if [ "$1" = "--complete" ]; then

  echo --list

  echo --list-exclude-eol

  echo --list-all

  echo --force

  echo --skip-existing

  echo --keep
@@ -80,11 +79,12 @@ for option in "${OPTIONS[@]}"; do 
    usage 0

    ;;

  "l" | "list" )

    ruby-build --definitions

    ruby-build --list

    exit

    ;;

  "L" | "list-exclude-eol" )

    ruby-build --definitions-exclude-eol

  "L" | "list-all" )

    ruby-build --definitions

    exit

    ;;

  "f" | "force" )

    FORCE=true

bin/ruby-build

+2 −3
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ 
#   -4/--ipv4        Resolve names to IPv4 addresses only

#   -6/--ipv6        Resolve names to IPv6 addresses only

#   -d/--definitions List all built-in definitions

#   --definitions-exclude-eol

#                    List all builtt-in definitions excluding EoL'ed

#   -l/--list        List built-in definitions except EoL'ed versions

#   --version        Show version of ruby-build

#
@@ -1241,7 +1240,7 @@ for option in "${OPTIONS[@]}"; do 
    list_definitions

    exit 0

    ;;

  "definitions-exclude-eol")

  "l" | "list")

    list_definitions_exclude_eol

    exit 0

    ;;