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}`