mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2026-08-24 10:05:29 -05:00
* Deprecated `chia plotters install` command * Fixed lint errors * Made it able to recognize plotter executables in venv * Added install-plotter.sh * Removed strings for debug * Added install-plotter.ps1 * Fixed an issue where madmax plotter under venv dir was not recognized by 'chia plotters' command * Added exec permission to install-plotter.sh * Fixed issues found in install-plotter.sh * Fixed lint errors * Added `-p` option to install.sh/install.ps1 * Fixed lint errors * Added nice deprecated warning * Fixed a lint error * Slightly improved branching * Made log messages look nice * Fixed an issue where install.sh/ps1 -p failed if virtual env is not acivated Co-authored-by: Izumi Hoshino <admin@chiamine.jp>
This commit is contained in:
co-authored by
Izumi Hoshino
parent
b4ac518c43
commit
d73e979720
+15
-2
@@ -3,11 +3,12 @@
|
||||
set -o errexit
|
||||
|
||||
USAGE_TEXT="\
|
||||
Usage: $0 [-adsh]
|
||||
Usage: $0 [-adsph]
|
||||
|
||||
-a automated install, no questions
|
||||
-d install development dependencies
|
||||
-s skip python package installation and just do pip install
|
||||
-p additional plotters installation
|
||||
-h display this help and exit
|
||||
"
|
||||
|
||||
@@ -18,8 +19,9 @@ usage() {
|
||||
PACMAN_AUTOMATED=
|
||||
EXTRAS=
|
||||
SKIP_PACKAGE_INSTALL=
|
||||
PLOTTER_INSTALL=
|
||||
|
||||
while getopts adsh flag
|
||||
while getopts adsph flag
|
||||
do
|
||||
case "${flag}" in
|
||||
# automated
|
||||
@@ -28,6 +30,7 @@ do
|
||||
d) EXTRAS=${EXTRAS}dev,;;
|
||||
# simple install
|
||||
s) SKIP_PACKAGE_INSTALL=1;;
|
||||
p) PLOTTER_INSTALL=1;;
|
||||
h) usage; exit 0;;
|
||||
*) echo; usage; exit 1;;
|
||||
esac
|
||||
@@ -338,6 +341,16 @@ python -m pip install wheel
|
||||
python -m pip install --extra-index-url https://pypi.chia.net/simple/ miniupnpc==2.2.2
|
||||
python -m pip install -e ."${EXTRAS}" --extra-index-url https://pypi.chia.net/simple/
|
||||
|
||||
if [ -n "$PLOTTER_INSTALL" ]; then
|
||||
set +e
|
||||
PREV_VENV="$VIRTUAL_ENV"
|
||||
export VIRTUAL_ENV="venv"
|
||||
./install-plotter.sh bladebit
|
||||
./install-plotter.sh madmax
|
||||
export VIRTUAL_ENV="$PREV_VENV"
|
||||
set -e
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Chia blockchain install.sh complete."
|
||||
echo "For assistance join us on Keybase in the #support chat channel:"
|
||||
|
||||
Reference in New Issue
Block a user