From 4c9a25acbf527902acfb7d9d605c02910977370c Mon Sep 17 00:00:00 2001 From: ronivay Date: Mon, 14 Dec 2020 10:31:23 +0200 Subject: [PATCH] Remove CentOS 7 support, #59 --- README.md | 3 +-- xo-install.sh | 17 +++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index db64fc2..be2c07e 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,6 @@ Script has been tested to work with following distros: - Ubuntu 18.04 Installation works but not tested frequently: -- CentOS 7 - Debian 8 - Debian 9 - Ubuntu 16.04 @@ -97,7 +96,7 @@ CentOS: - openssl-devel - redis - libpng-devel -- python +- python3 - git - nfs-utils - libvhdi-tools diff --git a/xo-install.sh b/xo-install.sh index 4b5558f..5f9340f 100755 --- a/xo-install.sh +++ b/xo-install.sh @@ -125,18 +125,11 @@ function InstallDependenciesCentOS { # Install necessary dependencies for XO build - #determine which python package is needed. CentOS 7 requires python, 8 is python3 - if [[ $OSVERSION == "8" ]]; then - PYTHON="python3" - else - PYTHON="python" - fi - # install packages echo printprog "Installing build dependencies, redis server, python, git, nfs-utils, cifs-utils" - cmdlog "yum -y install gcc gcc-c++ make openssl-devel redis libpng-devel $PYTHON git nfs-utils cifs-utils lvm2" - yum -y install gcc gcc-c++ make openssl-devel redis libpng-devel $PYTHON git nfs-utils cifs-utils lvm2 >>$LOGFILE 2>&1 + cmdlog "yum -y install gcc gcc-c++ make openssl-devel redis libpng-devel python3 git nfs-utils cifs-utils lvm2" + yum -y install gcc gcc-c++ make openssl-devel redis libpng-devel python3 git nfs-utils cifs-utils lvm2 >>$LOGFILE 2>&1 printok "Installing build dependencies, redis server, python, git, nfs-utils, cifs-utils" # only run automated node install if executable not found @@ -822,8 +815,8 @@ function CheckOS { if [ -f /etc/centos-release ] ; then OSVERSION=$(grep -Eo "[0-9]" /etc/centos-release | head -1) OSNAME="CentOS" - if [[ ! $OSVERSION =~ ^(7|8) ]]; then - printfail "Only CentOS 7/8 supported" + if [[ $OSVERSION != "8" ]]; then + printfail "Only CentOS 8 supported" exit 1 fi cmdlog "which xe" @@ -842,7 +835,7 @@ function CheckOS { exit 1 fi else - printfail "Only CentOS 7 / Ubuntu 16/18 and Debian 8/9 supported" + printfail "Only CentOS 8 / Ubuntu 16/18 and Debian 8/9 supported" exit 1 fi