add: nw-gyp镜像

3 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c21b74975ff5..4e76a1fb3faa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools Linux version.
 	pkgver = 1.05.2201240
-	pkgrel = 9
+	pkgrel = 10
 	epoch = 2
 	url = https://github.com/msojocs/wechat-devtools-linux
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 6ed7c2317d32..09920e441d55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _node_version="16.1.0"
 
 pkgname=wechat-devtools
 pkgver="${_wechat_devtools_ver}"  # 主版本号
-pkgrel=9   # 次版本号release
+pkgrel=10   # 次版本号release
 epoch=2    # 大版本迭代强制更新（维护者变更，尽量不用）
 pkgdesc="WeChat Devtools Linux version. "
 arch=("x86_64")
@@ -75,7 +75,7 @@ build() {
     # prepare nw-gyp
     _log "prepare nw-gyp"
     npm uninstall node-gyp -g
-    npm install nw-gyp node-gyp npm@latest -g
+    npm install nw-gyp node-gyp -g
 
     # node bin
     _log "copy node exectuable"
diff --git a/rebuild-modules.sh b/rebuild-modules.sh
index e4f57a7bc588..e9e45b5f0e33 100755
--- a/rebuild-modules.sh
+++ b/rebuild-modules.sh
@@ -35,9 +35,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
@@ -79,13 +80,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