From ddfab43f59092d147e9c8f825f59ab0baf7ee7cf Mon Sep 17 00:00:00 2001 From: s3fxn Date: Tue, 8 Oct 2019 22:42:00 +0900 Subject: [PATCH 1/4] add CentOS 7 and 8 support --- share/ruby-install/package_manager.sh | 17 ++++++++++++++++- share/ruby-install/ruby/dependencies.txt | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/share/ruby-install/package_manager.sh b/share/ruby-install/package_manager.sh index e4030c63..44cb390a 100644 --- a/share/ruby-install/package_manager.sh +++ b/share/ruby-install/package_manager.sh @@ -3,9 +3,22 @@ # # Auto-detect the package manager. # +function detect_distro() +{ + [ "$1" = "centos7" ] && test -f /etc/redhat-release && \ + grep -q '^CentOS Linux release 7' /etc/redhat-release && return 0 + + [ "$1" = "centos8" ] && test -f /etc/redhat-release && \ + grep -q '^CentOS Linux release 8' /etc/redhat-release && return 0 + + return 1 +} + function detect_package_manager() { - if command -v zypper >/dev/null; then package_manager="zypper" + if detect_distro centos7 ; then package_manager="centos7" + elif detect_distro centos8 ; then package_manager="centos8" + elif command -v zypper >/dev/null; then package_manager="zypper" elif command -v apt-get >/dev/null; then package_manager="apt" elif command -v dnf >/dev/null; then package_manager="dnf" elif command -v yum >/dev/null; then package_manager="yum" @@ -49,6 +62,8 @@ function install_packages() fi ;; zypper) $sudo zypper -n in -l $* || return $? ;; + centos7)$sudo yum install -y "$@" || return $? ;; + centos8)$sudo dnf install -y "$@" || return $? ;; "") warn "Could not determine Package Manager. Proceeding anyway." ;; esac } diff --git a/share/ruby-install/ruby/dependencies.txt b/share/ruby-install/ruby/dependencies.txt index 1d877061..e42eaea2 100644 --- a/share/ruby-install/ruby/dependencies.txt +++ b/share/ruby-install/ruby/dependencies.txt @@ -6,3 +6,5 @@ brew: automake bison openssl readline libyaml gdbm libffi pacman: gcc make bison zlib ncurses openssl readline libyaml gdbm libffi zypper: gcc make automake zlib-devel libyaml-devel libopenssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel pkg: openssl readline libyaml gdbm libffi +centos7: gcc automake bison zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel bzip2 +centos8: gcc automake bison zlib-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel From 4f5c41eb2f5dec2254d1632ed40f879e5982852f Mon Sep 17 00:00:00 2001 From: s3fxn Date: Tue, 8 Oct 2019 22:56:42 +0900 Subject: [PATCH 2/4] update dependencies.txt --- share/ruby-install/ruby/dependencies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/ruby-install/ruby/dependencies.txt b/share/ruby-install/ruby/dependencies.txt index e42eaea2..7abd838f 100644 --- a/share/ruby-install/ruby/dependencies.txt +++ b/share/ruby-install/ruby/dependencies.txt @@ -7,4 +7,4 @@ pacman: gcc make bison zlib ncurses openssl readline libyaml gdbm libffi zypper: gcc make automake zlib-devel libyaml-devel libopenssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel pkg: openssl readline libyaml gdbm libffi centos7: gcc automake bison zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel bzip2 -centos8: gcc automake bison zlib-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel +centos8: gcc automake bison zlib-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel bzip2 From 1fafe0d41bc1def859931d1b77f082c296a4e359 Mon Sep 17 00:00:00 2001 From: s3fxn Date: Wed, 9 Oct 2019 00:06:52 +0900 Subject: [PATCH 3/4] update dependencies.txt --- share/ruby-install/jruby/dependencies.txt | 2 ++ share/ruby-install/mruby/dependencies.txt | 2 ++ share/ruby-install/rbx/dependencies.txt | 2 ++ share/ruby-install/truffleruby/dependencies.txt | 2 ++ 4 files changed, 8 insertions(+) diff --git a/share/ruby-install/jruby/dependencies.txt b/share/ruby-install/jruby/dependencies.txt index e6ad3e10..d1f003a0 100644 --- a/share/ruby-install/jruby/dependencies.txt +++ b/share/ruby-install/jruby/dependencies.txt @@ -4,3 +4,5 @@ yum: java-openjdk pacman: jre8-openjdk zypper: java-1.8.0-openjdk pkg: openjdk +centos7: java-openjdk +centos8: java-openjdk diff --git a/share/ruby-install/mruby/dependencies.txt b/share/ruby-install/mruby/dependencies.txt index 2cba9b60..ff56847d 100644 --- a/share/ruby-install/mruby/dependencies.txt +++ b/share/ruby-install/mruby/dependencies.txt @@ -6,3 +6,5 @@ brew: bison pacman: gcc make bison zypper: gcc make bison pkg: gcc automake bison +centos7: gcc make bison +centos8: gcc make bison diff --git a/share/ruby-install/rbx/dependencies.txt b/share/ruby-install/rbx/dependencies.txt index 37b6a5ba..00fca943 100644 --- a/share/ruby-install/rbx/dependencies.txt +++ b/share/ruby-install/rbx/dependencies.txt @@ -6,3 +6,5 @@ brew: openssl readline libyaml gdbm pacman: gcc automake flex bison ruby llvm libedit zlib libyaml openssl gdbm readline ncurses zypper: gcc gcc-c++ make automake flex bison ruby2.2-devel ruby2.2-rubygem-bundler llvm-devel zlib-devel libyaml-devel libopenssl-devel gdbm-devel readline-devel ncurses-devel pkg: gmake flex bison ruby devel/ruby-gems llvm-devel openssl readline libyaml gdbm +centos7: gcc gcc-c++ automake flex bison ruby-devel rubygems llvm-static llvm-devel libedit-devel zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel bzip2 +centos8: gcc gcc-c++ automake flex bison ruby-devel rubygems llvm-static llvm-devel libedit-devel zlib-devel openssl-devel gdbm-devel readline-devel ncurses-devel bzip2 diff --git a/share/ruby-install/truffleruby/dependencies.txt b/share/ruby-install/truffleruby/dependencies.txt index 9e42946c..8627442b 100644 --- a/share/ruby-install/truffleruby/dependencies.txt +++ b/share/ruby-install/truffleruby/dependencies.txt @@ -6,3 +6,5 @@ brew: openssl llvm@4 pacman: zlib openssl clang llvm make zypper: zlib-devel libopenssl-devel llvm-clang llvm make pkg: openssl llvm-devel +centos7: zlib-devel openssl-devel clang llvm make +centos8: zlib-devel openssl-devel clang llvm make From 11d581eb25ff2cee559b4582db8fd5b519b71eea Mon Sep 17 00:00:00 2001 From: s3fxn Date: Mon, 14 Oct 2019 20:41:41 +0900 Subject: [PATCH 4/4] add --enablerepo for centos8 libyaml-devel --- share/ruby-install/package_manager.sh | 2 +- share/ruby-install/rbx/dependencies.txt | 2 +- share/ruby-install/ruby/dependencies.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/ruby-install/package_manager.sh b/share/ruby-install/package_manager.sh index 44cb390a..8ec4af8f 100644 --- a/share/ruby-install/package_manager.sh +++ b/share/ruby-install/package_manager.sh @@ -63,7 +63,7 @@ function install_packages() ;; zypper) $sudo zypper -n in -l $* || return $? ;; centos7)$sudo yum install -y "$@" || return $? ;; - centos8)$sudo dnf install -y "$@" || return $? ;; + centos8)$sudo dnf install -y --enablerepo PowerTools "$@" || return $? ;; "") warn "Could not determine Package Manager. Proceeding anyway." ;; esac } diff --git a/share/ruby-install/rbx/dependencies.txt b/share/ruby-install/rbx/dependencies.txt index 00fca943..8d00a43f 100644 --- a/share/ruby-install/rbx/dependencies.txt +++ b/share/ruby-install/rbx/dependencies.txt @@ -7,4 +7,4 @@ pacman: gcc automake flex bison ruby llvm libedit zlib libyaml openssl gdbm read zypper: gcc gcc-c++ make automake flex bison ruby2.2-devel ruby2.2-rubygem-bundler llvm-devel zlib-devel libyaml-devel libopenssl-devel gdbm-devel readline-devel ncurses-devel pkg: gmake flex bison ruby devel/ruby-gems llvm-devel openssl readline libyaml gdbm centos7: gcc gcc-c++ automake flex bison ruby-devel rubygems llvm-static llvm-devel libedit-devel zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel bzip2 -centos8: gcc gcc-c++ automake flex bison ruby-devel rubygems llvm-static llvm-devel libedit-devel zlib-devel openssl-devel gdbm-devel readline-devel ncurses-devel bzip2 +centos8: gcc gcc-c++ automake flex bison ruby-devel rubygems llvm-static llvm-devel libedit-devel zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel bzip2 diff --git a/share/ruby-install/ruby/dependencies.txt b/share/ruby-install/ruby/dependencies.txt index 7abd838f..69aac649 100644 --- a/share/ruby-install/ruby/dependencies.txt +++ b/share/ruby-install/ruby/dependencies.txt @@ -7,4 +7,4 @@ pacman: gcc make bison zlib ncurses openssl readline libyaml gdbm libffi zypper: gcc make automake zlib-devel libyaml-devel libopenssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel pkg: openssl readline libyaml gdbm libffi centos7: gcc automake bison zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel bzip2 -centos8: gcc automake bison zlib-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel bzip2 +centos8: gcc automake bison zlib-devel libyaml-devel openssl-devel gdbm-devel readline-devel ncurses-devel libffi-devel bzip2