Chia-Network/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2024-09-11 18:58:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix install-gui.sh (#10460)

Browse Source 
* Fixed an issue where running  with gui git branch specified failed

* Fixed an issue where install-gui.sh failed if npm>=7 and NodeJS < 16 were installed

* Fixed inconsistent npm path issue

* Fixed typo
This commit is contained in:
ChiaMineJP 2022-03-05 07:06:13 +09:00 committed by GitHub
parent 4c345e2fa5
commit 816251ec0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
install-gui.sh
View File

@ -32,13 +32,20 @@ nodejs_is_installed(){
} }
do_install_npm_locally(){ do_install_npm_locally(){
NODEJS_VERSION="$(node -v | cut -d'.' -f 1 | sed -e 's/^v//')"
NPM_VERSION="$(npm -v | cut -d'.' -f 1)" NPM_VERSION="$(npm -v | cut -d'.' -f 1)"
if [ "$NPM_VERSION" -lt "7" ]; then
echo "Current npm version($(npm -v)) is less than 7. GUI app requires npm>=7." if [ "$NODEJS_VERSION" -lt "16" ] || [ "$NPM_VERSION" -lt "7" ]; then
if [ "$NODEJS_VERSION" -lt "16" ]; then
echo "Current NodeJS version($(node -v)) is less than 16. GUI app requires NodeJS>=16."
fi
if [ "$NPM_VERSION" -lt "7" ]; then
echo "Current npm version($(npm -v)) is less than 7. GUI app requires npm>=7."
fi
if [ "$(uname)" = "OpenBSD" ] || [ "$(uname)" = "FreeBSD" ]; then if [ "$(uname)" = "OpenBSD" ] || [ "$(uname)" = "FreeBSD" ]; then
# `n` package does not support OpenBSD/FreeBSD # `n` package does not support OpenBSD/FreeBSD
echo "Please install npm>=7 manually" echo "Please install NodeJS>=16 and/or npm>=7 manually"
exit 1 exit 1
fi fi
@ -61,17 +68,39 @@ do_install_npm_locally(){
# `n 16` here installs nodejs@16 under $N_PREFIX directory # `n 16` here installs nodejs@16 under $N_PREFIX directory
echo "n 16" echo "n 16"
n 16 n 16
echo "Current NodeJS version: $(node -v)"
echo "Current npm version: $(npm -v)" echo "Current npm version: $(npm -v)"
if [ "$(node -v | cut -d'.' -f 1 | sed -e 's/^v//')" -lt "16" ]; then
echo "Error: Failed to install NodeJS>=16"
exit 1
fi
if [ "$(npm -v | cut -d'.' -f 1)" -lt "7" ]; then if [ "$(npm -v | cut -d'.' -f 1)" -lt "7" ]; then
echo "Error: Failed to install npm>=7" echo "Error: Failed to install npm>=7"
exit 1 exit 1
fi fi
cd "${SCRIPT_DIR}" cd "${SCRIPT_DIR}"
else else
echo "Found NodeJS $(node -v)"
echo "Found npm $(npm -v)" echo "Found npm $(npm -v)"
fi fi
} }
# Work around for inconsistent `npm` exec path issue
# https://github.com/Chia-Network/chia-blockchain/pull/10460#issuecomment-1054492495
patch_inconsistent_npm_issue(){
node_module_dir=$1
if [ ! -d "$node_module_dir" ]; then
mkdir "$node_module_dir"
fi
if [ ! -d "${node_module_dir}/.bin" ]; then
mkdir "${node_module_dir}/.bin"
fi
if [ -e "${node_module_dir}/.bin/npm" ]; then
rm -f "${node_module_dir}/.bin/npm"
fi
ln -s "$(command -v npm)" "${node_module_dir}/.bin/npm"
}
# Manage npm and other install requirements on an OS specific basis # Manage npm and other install requirements on an OS specific basis
if [ "$(uname)" = "Linux" ]; then if [ "$(uname)" = "Linux" ]; then
#LINUX=1 #LINUX=1
@ -155,17 +184,22 @@ if [ ! "$CI" ]; then
if [ "$SUBMODULE_BRANCH" ]; if [ "$SUBMODULE_BRANCH" ];
then then
git fetch git fetch --all
git checkout "$SUBMODULE_BRANCH" git reset --hard "$SUBMODULE_BRANCH"
git pull
echo "" echo ""
echo "Building the GUI with branch $SUBMODULE_BRANCH" echo "Building the GUI with branch $SUBMODULE_BRANCH"
echo "" echo ""
fi fi
# Work around for inconsistent `npm` exec path issue
# https://github.com/Chia-Network/chia-blockchain/pull/10460#issuecomment-1054492495
patch_inconsistent_npm_issue "../node_modules"
npm ci npm ci
npm audit fix || true npm audit fix || true
npm run build npm run build
# Set modified output of `chia version` to version property of GUI's package.json
python ../installhelper.py python ../installhelper.py
else else
echo "Skipping node.js in install.sh on MacOS ci." echo "Skipping node.js in install.sh on MacOS ci."