From dc6498e3aabd5bb5ab2576b60eb4ab548e626441 Mon Sep 17 00:00:00 2001
From: msojocs <jiyecafe@gmail.com>
Date: Fri, 25 Feb 2022 18:57:32 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=9C=A8=E6=9E=84=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E5=81=9A=E9=80=82=E5=BD=93=E7=B2=BE=E7=AE=80=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/rebuild-node-modules | 7 ++++---
 tools/update-node-node     | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/rebuild-node-modules b/tools/rebuild-node-modules
index f09d079..ee497d6 100755
--- a/tools/rebuild-node-modules
+++ b/tools/rebuild-node-modules
@@ -102,12 +102,13 @@ cp -fr "${package_dir}/node_modules_tmp/node_modules/nodegit" "${package_dir}/no
 (cp -fr "${package_dir}/node_modules_tmp/node_modules/oniguruma" "${package_dir}/node_modules_tmp/node_modules/oniguruma-node")
 (cp -fr "${package_dir}/node_modules_tmp/node_modules/spdlog" "${package_dir}/node_modules_tmp/node_modules/spdlog-node")
 
-(cd "${package_dir}/node_modules_tmp/node_modules" && find -name "obj.target" | xargs -I{} rm -rf {})
-(cd "${package_dir}/node_modules_tmp/node_modules" && find -name "*.node" | xargs -I{} cp -rf {} ${package_dir}/node_modules/{})
+(cd "${package_dir}/node_modules_tmp/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)
+(cd "${package_dir}/node_modules_tmp/node_modules" && find -name "*.node" | xargs -I{} \cp -rf {} ${package_dir}/node_modules/{})
 
 mkdir -p "${package_dir}/node_modules/vscode-ripgrep/bin"
-cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${package_dir}/node_modules/vscode-ripgrep/bin/rg"
+\cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${package_dir}/node_modules/vscode-ripgrep/bin/rg"
 
+(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"
 
 # 移除旧配置
diff --git a/tools/update-node-node b/tools/update-node-node
index 8e654f3..3c5ef2e 100755
--- a/tools/update-node-node
+++ b/tools/update-node-node
@@ -105,7 +105,6 @@ const start = async () => {
         const localPath = await download();
         const extractPath = await extract(localPath);
         await upgrade(extractPath);
-        execSync(`${path.resolve(__dirname, "../node/bin/npm")} install node-gyp`)
 
         console.log(
             `Succeeded upgrading nodeConfig to version ${nodeConfig.version}`