From e2a69b97412ae1d4e19d481b6aa200554b03be49 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Fri, 17 Apr 2020 17:20:24 -0700 Subject: [PATCH] Correctly detect brew/boost and add vdf_bench to .gitignore --- .gitignore | 3 +++ install-timelord.sh | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 87278720ed..89d89e43e6 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,9 @@ activate # Packaging chia-blockchain.tar.gz +# Timelord utilities +vdf_bench + # Electron wallet node modules src/wallet/electron/node_modules/ diff --git a/install-timelord.sh b/install-timelord.sh index 4402c81ce3..9595a8751f 100644 --- a/install-timelord.sh +++ b/install-timelord.sh @@ -25,10 +25,15 @@ else 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 ln -s venv/lib/python3.7/site-packages/vdf_bench - elif [ -e venv/bin/python ] && test $MACOS && ! brew info boost>/dev/null 2>&1 + elif [ -e venv/bin/python ] && test $MACOS && brew info boost | grep -q 'Not installed' then echo "Installing chiavdf requirements for MacOS" brew install boost + echo "installing chiavdf from source for MacOS" + # User needs to provide required packages + 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 + ln -s venv/lib/python3.7/site-packages/vdf_bench elif [ -e venv/bin/python ] then echo "installing chiavdf from source"