From fdb6902656d0075749a1b70b54c001031001a199 Mon Sep 17 00:00:00 2001 From: LeroyINC Date: Wed, 9 Aug 2023 15:08:54 -0500 Subject: [PATCH 1/3] Fix timelord-install.sh for CentOS\RHEL Signed-off-by: LeroyINC --- install-timelord.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/install-timelord.sh b/install-timelord.sh index cfa59c929c29..2af5f0b7c018 100644 --- a/install-timelord.sh +++ b/install-timelord.sh @@ -76,14 +76,21 @@ symlink_vdf_bench() { if [ "$(uname)" = "Linux" ] && type apt-get; then UBUNTU_DEBIAN=true echo "Found Ubuntu/Debian." + elif [ "$(uname)" = "Linux" ] && type dnf || yum; then RHEL_BASED=true echo "Found RedHat." + + if [ "$INSTALL_PYTHON_DEV" ]; then + PYTHON_DEV_DEPENDENCY="$PYTHON_VERSION"-devel + fi + elif [ "$(uname)" = "Darwin" ]; then MACOS=true echo "Found MacOS." fi + if [ -e "$THE_PATH" ]; then echo "$THE_PATH" echo "vdf_client already exists, no action taken" @@ -102,8 +109,8 @@ else elif [ -e venv/bin/python ] && test "$RHEL_BASED"; then echo "Installing chiavdf dependencies on RedHat/CentOS/Fedora" # Install remaining needed development tools - assumes venv and prior run of install.sh - echo "yum install gcc gcc-c++ gmp-devel $PYTHON_DEV_DEPENDENCY libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y" - sudo yum install gcc gcc-c++ gmp-devel "$PYTHON_DEV_DEPENDENCY" libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y + echo "yum install gcc gcc-c++ gmp-devel $PYTHON_DEV_DEPENDENCY libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y" | tr -s ' ' + sudo yum install gcc gcc-c++ gmp-devel "$PYTHON_DEV_DEPENDENCY" libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y | tr -s ' ' echo "Installing chiavdf from source on RedHat/CentOS/Fedora" echo venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION" venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION" From 781b5eb34b20a9b984a0191d92a0dabbd503fda6 Mon Sep 17 00:00:00 2001 From: Leroy Ladyzhensky <95300898+LeroyINC@users.noreply.github.com> Date: Thu, 10 Aug 2023 13:35:38 -0400 Subject: [PATCH 2/3] Update install-timelord.sh Changed command structure to be more compatible with different flavors of Linux --- install-timelord.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/install-timelord.sh b/install-timelord.sh index 2af5f0b7c018..9ed7f9766544 100644 --- a/install-timelord.sh +++ b/install-timelord.sh @@ -82,7 +82,9 @@ elif [ "$(uname)" = "Linux" ] && type dnf || yum; then echo "Found RedHat." if [ "$INSTALL_PYTHON_DEV" ]; then - PYTHON_DEV_DEPENDENCY="$PYTHON_VERSION"-devel + yumcmd="sudo yum install "$PYTHON_VERSION"-devel gcc gcc-c++ gmp-devel libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y" + else + yumcmd="sudo yum install gcc gcc-c++ gmp-devel libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y" fi elif [ "$(uname)" = "Darwin" ]; then @@ -109,8 +111,8 @@ else elif [ -e venv/bin/python ] && test "$RHEL_BASED"; then echo "Installing chiavdf dependencies on RedHat/CentOS/Fedora" # Install remaining needed development tools - assumes venv and prior run of install.sh - echo "yum install gcc gcc-c++ gmp-devel $PYTHON_DEV_DEPENDENCY libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y" | tr -s ' ' - sudo yum install gcc gcc-c++ gmp-devel "$PYTHON_DEV_DEPENDENCY" libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y | tr -s ' ' + echo "$yumcmd" + ${yumcmd} echo "Installing chiavdf from source on RedHat/CentOS/Fedora" echo venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION" venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION" From 7f0714802e3e622183cbf6dace7f1391985d9690 Mon Sep 17 00:00:00 2001 From: Leroy Ladyzhensky <95300898+LeroyINC@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:16:11 -0400 Subject: [PATCH 3/3] Update install-timelord.sh updated as requested. --- install-timelord.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-timelord.sh b/install-timelord.sh index 9ed7f9766544..ea2e6c9e2f31 100644 --- a/install-timelord.sh +++ b/install-timelord.sh @@ -82,7 +82,7 @@ elif [ "$(uname)" = "Linux" ] && type dnf || yum; then echo "Found RedHat." if [ "$INSTALL_PYTHON_DEV" ]; then - yumcmd="sudo yum install "$PYTHON_VERSION"-devel gcc gcc-c++ gmp-devel libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y" + yumcmd="sudo yum install $PYTHON_VERSION-devel gcc gcc-c++ gmp-devel libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y" else yumcmd="sudo yum install gcc gcc-c++ gmp-devel libtool make autoconf automake openssl-devel libevent-devel boost-devel python3 cmake -y" fi