Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update embedded Ruby to 2.5.3 #145

Closed
wants to merge 5 commits into from
Closed

Update embedded Ruby to 2.5.3 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5fbf59b
Fix `apt-add-repository` not being found
syndbg Nov 26, 2018
a5c901c
Update Ruby to 2.5
syndbg Nov 26, 2018
b8c736c
Fix netcat package installation
syndbg Nov 26, 2018
783e55a
Fix apt-get expecting interactive input
syndbg Nov 26, 2018
f708016
Update Ruby to 2.5.3
syndbg Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions packer/vagrant/scripts/ubuntu/ruby.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
#!/bin/bash

DEBIAN_FRONTEND=noninteractive apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -qy software-properties-common
DEBIAN_FRONTEND=noninteractive apt-add-repository -y ppa:brightbox/ruby-ng
DEBIAN_FRONTEND=noninteractive apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -qy ruby2.4 ruby2.4-dev build-essential zip unzip
DEBIAN_FRONTEND=noninteractive apt-get install -qy ruby2.5 ruby2.5-dev build-essential zip unzip

update-alternatives --remove ruby /usr/bin/ruby2.4
update-alternatives --remove irb /usr/bin/irb2.4
update-alternatives --remove gem /usr/bin/gem2.4
update-alternatives --remove ruby /usr/bin/ruby2.5
update-alternatives --remove irb /usr/bin/irb2.5
update-alternatives --remove gem /usr/bin/gem2.5

update-alternatives \
--install /usr/bin/ruby ruby /usr/bin/ruby2.4 50 \
--slave /usr/bin/irb irb /usr/bin/irb2.4 \
--slave /usr/bin/rake rake /usr/bin/rake2.4 \
--slave /usr/bin/gem gem /usr/bin/gem2.4 \
--slave /usr/bin/rdoc rdoc /usr/bin/rdoc2.4 \
--slave /usr/bin/testrb testrb /usr/bin/testrb2.4 \
--slave /usr/bin/erb erb /usr/bin/erb2.4 \
--slave /usr/bin/ri ri /usr/bin/ri2.4
--install /usr/bin/ruby ruby /usr/bin/ruby2.5 50 \
--slave /usr/bin/irb irb /usr/bin/irb2.5 \
--slave /usr/bin/rake rake /usr/bin/rake2.5 \
--slave /usr/bin/gem gem /usr/bin/gem2.5 \
--slave /usr/bin/rdoc rdoc /usr/bin/rdoc2.5 \
--slave /usr/bin/testrb testrb /usr/bin/testrb2.5 \
--slave /usr/bin/erb erb /usr/bin/erb2.5 \
--slave /usr/bin/ri ri /usr/bin/ri2.5

update-alternatives --config ruby
4 changes: 2 additions & 2 deletions substrate/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ libxslt_version="1.1.32"
libyaml_version="0.1.7"
openssl_version="1.1.0g"
readline_version="7.0"
ruby_version="2.4.4"
ruby_version="2.5.3"
xz_version="5.2.3"
zlib_version="1.2.11"

Expand Down Expand Up @@ -78,7 +78,7 @@ pushd "${setupdir}"

echo_stderr " -> Installing any required packages..."
if [[ "${linux_os}" = "ubuntu" ]]; then
apt-get install -qy build-essential autoconf automake chrpath libtool
DEBIAN_FRONTEND=noninteractive apt-get install -qy build-essential autoconf automake chrpath libtool
fi

if [[ "${linux_os}" = "centos" ]]; then
Expand Down
3 changes: 2 additions & 1 deletion substrate/vagrant-scripts/ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/sh

apt-get update -yq
apt-get install -yq nc
# NOTE: `nc` package may be available as `netcat`
apt-get install -yq nc || apt-get install -yq netcat

# if the proxy is around, use it
nc -z -w3 192.168.1.1 8123 && export http_proxy="http://192.168.1.1:8123"
Expand Down