From ac1181c1b4e2d270a187d713840f201fdbbe89a3 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Sun, 28 Jul 2024 15:56:48 -0700 Subject: [PATCH] Refine vendor scripts --- scripts/vendor-node.cjs | 4 ++-- scripts/vendor-protoc.cjs | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/vendor-node.cjs b/scripts/vendor-node.cjs index 52ebe471..cf27a567 100644 --- a/scripts/vendor-node.cjs +++ b/scripts/vendor-node.cjs @@ -1,7 +1,7 @@ const path = require('node:path'); const decompress = require('decompress'); const Downloader = require("nodejs-file-downloader"); -const {rmSync, unlinkSync, cpSync, mkdirSync, existsSync} = require("node:fs"); +const {rmSync, cpSync, mkdirSync, existsSync} = require("node:fs"); const {execSync} = require("node:child_process"); const NODE_VERSION = 'v22.5.1'; @@ -58,7 +58,7 @@ mkdirSync(destDir, {recursive: true}); await decompress(filePath, tmpDir, {}); // Remove the original archive - unlinkSync(filePath); + rmSync(filePath); // Copy binary const binSrc = path.join(tmpDir, SRC_BIN_MAP[key]); diff --git a/scripts/vendor-protoc.cjs b/scripts/vendor-protoc.cjs index e4015fca..dd42b4f5 100644 --- a/scripts/vendor-protoc.cjs +++ b/scripts/vendor-protoc.cjs @@ -1,8 +1,7 @@ const decompress = require('decompress'); const Downloader = require("nodejs-file-downloader"); const path = require("node:path"); -const fs = require("node:fs"); -const {rmSync, mkdirSync} = require("node:fs"); +const {rmSync, mkdirSync, cpSync} = require("node:fs"); // `${process.platform}_${process.arch}` const MAC_ARM = 'darwin_arm64'; @@ -48,17 +47,17 @@ mkdirSync(dstDir, {recursive: true}); await decompress(filePath, tmpDir, {}); // Remove the original archive - fs.unlinkSync(filePath); + rmSync(filePath); // Copy binary const binSrc = path.join(tmpDir, SRC_BIN_MAP[key]); const binDst = path.join(dstDir, DST_BIN_MAP[key]); - fs.cpSync(binSrc, binDst); + cpSync(binSrc, binDst); // Copy other files const includeSrc = path.join(tmpDir, 'include'); const includeDst = path.join(dstDir, 'include'); - fs.cpSync(includeSrc, includeDst, {recursive: true}); + cpSync(includeSrc, includeDst, {recursive: true}); rmSync(tmpDir, {recursive: true, force: true});