From e16c84007b99269b6013b1a5c3af7d8f76960500 Mon Sep 17 00:00:00 2001 From: msojocs Date: Mon, 14 Feb 2022 00:12:25 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0nw-gyp=E7=9A=84?= =?UTF-8?q?=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/rebuild-node-modules | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/rebuild-node-modules b/tools/rebuild-node-modules index 01c5bad..c18deff 100755 --- a/tools/rebuild-node-modules +++ b/tools/rebuild-node-modules @@ -33,9 +33,10 @@ echo "NW VERSION: $NW_VERSION" echo "nw-gyp version: $( nw-gyp --version )" echo "node version: $(node --version )" echo "npm version: $(npm --version )" +python --version if [[ ! -z $https_proxy || ! -z $http_proxy ]]; then - echo -e "\033[41;37m 警告: 你设置了代理,这有可能导致安装出现异常 \033[0m" + echo -e "\033[41;37m 警告: 你设置了代理,这有可能导致安装出现异常 $http_proxy, $https_proxy \033[0m" fi rm -fr "${package_dir}/node_modules/vscode-windows-ca-certs" # the module is only available in windows @@ -77,13 +78,13 @@ rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node" --nodegit_binary_host_mirror=https://npm.taobao.org/mirrors/nodegit/v0.27.0/) # reinstall modules # rebuild -cd "$package_dir/node_modules_tmp/node_modules/node-pty" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" +cd "$package_dir/node_modules_tmp/node_modules/node-pty" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs (cp -fr "${package_dir}/node_modules_tmp/node_modules/node-pty" "${package_dir}/node_modules_tmp/node_modules/node-pty-node") rm -rf "${package_dir}/node_modules/node-pty" "${package_dir}/node_modules/node-pty-node" cp -fr "${package_dir}/node_modules_tmp/node_modules/node-pty" "${package_dir}/node_modules" (cp -fr "${package_dir}/node_modules/node-pty" "${package_dir}/node_modules/node-pty-node") -cd "$package_dir/node_modules_tmp/node_modules/native-watchdog" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" +cd "$package_dir/node_modules_tmp/node_modules/native-watchdog" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs rm -rf "${package_dir}/node_modules/native-watchdog" && cp -fr "${package_dir}/node_modules_tmp/node_modules/native-watchdog" "${package_dir}/node_modules" cd "${package_dir}/node_modules_tmp/node_modules/nodegit" && rm -rf .github include src lifecycleScripts vendor utils build/vendor build/Release/.deps