diff --git a/bin/install b/bin/install index 59632d7946e77fd8a859345a428654faa06e0a35..7dadee94439fd310b0b40b8942f89a3e63a600b4 100755 --- a/bin/install +++ b/bin/install @@ -181,22 +181,12 @@ get_download_url() { local ruby_version=$(get_ruby_version $version) if [ "${ruby_type}" = "ruby" ]; then - local ruby_base_version=$(get_ruby_base_version $ruby_version) - echo "http://cache.ruby-lang.org/pub/ruby/${ruby_base_version}/ruby-${ruby_version}.tar.gz" + echo "http://cache.ruby-lang.org/pub/ruby/ruby-${ruby_version}.tar.gz" elif [ "${ruby_type}" = "jruby" ]; then echo "https://s3.amazonaws.com/jruby.org/downloads/${ruby_version}/jruby-bin-${ruby_version}.tar.gz" fi } - -get_ruby_base_version() { - IFS='-' read -a version_info <<< "$1" - IFS='.' read -a version <<< "${version_info[0]}" - - echo "${version[0]}.${version[1]}" -} - - get_ruby_version() { IFS='-' read -a version_info <<< "$1" diff --git a/bin/list-all b/bin/list-all index f28ef867ca396c794854b5f032c84495995b79e6..23f309581ea4436f62eb5b7258b61e8e7b8394a3 100755 --- a/bin/list-all +++ b/bin/list-all @@ -1,23 +1,17 @@ #!/usr/bin/env bash -versions_list=( - jruby-9.0.4.0 - 1.9.3-p551 - 2.1.4 - 2.1.5 - 2.1.6 - 2.1.7 - 2.2.0 - 2.2.1 - 2.2.2 - 2.2.3 - 2.3.0 - 2.3.1 +ruby_versions=$( + curl --silent "http://cache.ruby-lang.org/pub/ruby/" \ + | sed -n -E 's/^.*"(ruby-)(.*).tar.gz".*$/\2/p' \ + | sort \ + | uniq ) -versions="" +jruby_versions=( + jruby-9.0.4.0 +) -for version in "${versions_list[@]}" +for version in "${ruby_versions[@]} ${jruby_versions[@]}" do versions="${versions} ${version}" done