From b00dfb3ef7d46f0423fa916078c6de6506ad525f Mon Sep 17 00:00:00 2001
From: msojocs <jiyecafe@gmail.com>
Date: Wed, 6 Apr 2022 23:20:48 +0800
Subject: [PATCH] feat: nodegit compiler in parallel

---
 res/flatpak/startup.sh           |  4 ++++
 tools/rebuild-node-modules.sh    |  6 +++---
 tools/setup-wechat-devtools-bash | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 res/flatpak/startup.sh

diff --git a/res/flatpak/startup.sh b/res/flatpak/startup.sh
new file mode 100644
index 0000000..92803f4
--- /dev/null
+++ b/res/flatpak/startup.sh
@@ -0,0 +1,4 @@
+#!/bin/sh 
+export PATH="/var/run/host/usr/bin:$PATH"
+export LD_LIBRARY_PATH="/app/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
+exec /app/opt/bin/wechat-devtools
\ No newline at end of file
diff --git a/tools/rebuild-node-modules.sh b/tools/rebuild-node-modules.sh
index bd7dcf8..6d65614 100755
--- a/tools/rebuild-node-modules.sh
+++ b/tools/rebuild-node-modules.sh
@@ -69,6 +69,8 @@ rm -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep"
 rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog"
 rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node"
 
+max_thread=$(cat /proc/cpuinfo| grep "processor"| wc -l)
+export JOBS=$max_thread
 (cd "${package_dir}/node_modules_tmp" && npm install \
     extract-file-icon \
     native-keymap \
@@ -80,6 +82,7 @@ rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node"
     vscode-oniguruma \
     vscode-ripgrep \
     nodegit \
+    --registry=http://registry.npmmirror.com
     --nodegit_binary_host_mirror=http://npmmirror.com/mirrors/nodegit/v0.27.0/) # reinstall modules
 
 # rebuild
@@ -106,6 +109,3 @@ mkdir -p "${package_dir}/node_modules/vscode-ripgrep/bin"
 
 (cd "${package_dir}/node_modules" && find -name ".deps" | xargs -I{} rm -rf {} && find -name "obj.target" | xargs -I{} rm -rf {} && find -name "*.a" -delete && find -name "*.lib" -delete && find -name "*.mk" -delete && find -name "*Makefile" -delete && find -name "*gyp*" -delete)
 rm -rf "${package_dir}/node_modules_tmp"
-
-# 移除旧配置
-# rm -fr ~/.config/wechat_devtools
diff --git a/tools/setup-wechat-devtools-bash b/tools/setup-wechat-devtools-bash
index dbbf0fa..47f62cc 100755
--- a/tools/setup-wechat-devtools-bash
+++ b/tools/setup-wechat-devtools-bash
@@ -39,17 +39,17 @@ fi
 export PATH="$root_dir/node/bin":$PATH
 if [ $ACTION_MODE!='true' ]; then
     notice "非ACTION模式, 设置镜像源"
-    npm set registry http://registry.npmmirror.com/ # 注册模块镜像
-    npm set disturl http://npmmirror.com/dist # node-gyp 编译依赖的 node 源码镜像
+    npm config set registry http://registry.npmmirror.com/ # 注册模块镜像
+    npm config set disturl http://npmmirror.com/dist # node-gyp 编译依赖的 node 源码镜像
     ## 以下选择添加
-    npm set sass_binary_site http://npmmirror.com/mirrors/node-sass # node-sass 二进制包镜像
-    npm set electron_mirror http://npmmirror.com/mirrors/electron/ # electron 二进制包镜像
-    npm set puppeteer_download_host http://npmmirror.com/mirrors # puppeteer 二进制包镜像
-    npm set chromedriver_cdnurl http://npmmirror.com/mirrors/chromedriver # chromedriver 二进制包镜像
-    npm set operadriver_cdnurl http://npmmirror.com/mirrors/operadriver # operadriver 二进制包镜像
-    npm set phantomjs_cdnurl http://npmmirror.com/mirrors/phantomjs # phantomjs 二进制包镜像
-    npm set selenium_cdnurl http://npmmirror.com/mirrors/selenium # selenium 二进制包镜像
-    npm set node_inspector_cdnurl http://npmmirror.com/mirrors/node-inspector # node-inspector 二进制包镜像
+    npm config set sass_binary_site http://npmmirror.com/mirrors/node-sass # node-sass 二进制包镜像
+    npm config set electron_mirror http://npmmirror.com/mirrors/electron/ # electron 二进制包镜像
+    npm config set puppeteer_download_host http://npmmirror.com/mirrors # puppeteer 二进制包镜像
+    npm config set chromedriver_cdnurl http://npmmirror.com/mirrors/chromedriver # chromedriver 二进制包镜像
+    npm config set operadriver_cdnurl http://npmmirror.com/mirrors/operadriver # operadriver 二进制包镜像
+    npm config set phantomjs_cdnurl http://npmmirror.com/mirrors/phantomjs # phantomjs 二进制包镜像
+    npm config set selenium_cdnurl http://npmmirror.com/mirrors/selenium # selenium 二进制包镜像
+    npm config set node_inspector_cdnurl http://npmmirror.com/mirrors/node-inspector # node-inspector 二进制包镜像
     # npm cache clean --force # 清空缓存
 fi
 echo "=====安装node-gyp nw-gyp===="