Commit e2b65f5d authored by Koichiro Iwao's avatar Koichiro Iwao
Browse files

Merge branch 'master' into list-exclude-eol

parents c634b8e8 3ef704e7

README.md

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ $ PREFIX=/usr/local ./ruby-build/install.sh 
$ brew update && brew upgrade ruby-build



# As an rbenv plugin

$ cd "$(rbenv root)"/plugins/ruby-build && git pull

$ git -C "$(rbenv root)"/plugins/ruby-build pull

```



## Usage

bin/rbenv-install

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ if [ "$STATUS" == "2" ]; then 
      echo "  brew update && brew upgrade ruby-build"

    elif [ -d "${here}/.git" ]; then

      printf ":\n\n"

      echo "  cd ${here} && git pull && cd -"

      echo "  git -C ${here} pull"

    else

      printf ".\n"

    fi

bin/ruby-build

+4 −2
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
#   -v/--verbose     Verbose mode: print compilation status to stdout

#   -4/--ipv4        Resolve names to IPv4 addresses only

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

#   --definitions    List all built-in definitions

#   --definitions    List all local definitions

#   -l/--list        List latest stable releases for each Ruby

#   --version        Show version of ruby-build

#



RUBY_BUILD_VERSION="20200115"

RUBY_BUILD_VERSION="20200401"



OLDIFS="$IFS"
@@ -757,6 +757,8 @@ remove_windows_files() { 
}



build_package_copy() {

  # Make sure there are no leftover files in $PREFIX_PATH

  rm -rf "$PREFIX_PATH"

  mkdir -p "$PREFIX_PATH"

  cp -fR . "$PREFIX_PATH"

}

script/release

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 


set -e



echo "Running hub to see if configured correctly"

echo "This shows the latest release:"

hub release -L1



git fetch -q --tags origin master

git checkout -q master

git merge --ff-only @{upstream}

script/update-cruby

0 → 100755
+23 −0
Original line number Diff line number Diff line 
#!/usr/bin/env bash



set -e

set -o pipefail



if [ $# -ne 2 ]; then

  echo "usage: $0 VERSION RELEASE_DIRECTORY"

  exit 1

fi



version="$1"

release_directory="$2"

file="share/ruby-build/${version}"



basename="ruby-${version}.tar.bz2"

major_minor_version=$(echo ${version} | cut -d '.' -f 1,2)

url="https://cache.ruby-lang.org/pub/ruby/${major_minor_version}/${basename}"

sha256=$(sha256sum "$release_directory/$basename" | cut -d ' ' -f 1)



cat > "$file" <<EOS

install_package "openssl-1.1.1d" "https://www.openssl.org/source/openssl-1.1.1d.tar.gz#1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2" mac_openssl --if has_broken_mac_openssl

install_package "ruby-${version}" "${url}#${sha256}" ldflags_dirs enable_shared standard verify_openssl

EOS