mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-21 15:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: prevent unnecessary execution of sed

Browse source 
Use lazy, memoized getter to prevent unnecessary execution of `sed`
every time the Gruntfile.js file is loaded.
This commit is contained in:
Bart van Andel 2025-04-08 18:27:38 +02:00
parent 13d776f78b
commit eef1d5d074
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Gruntfile.js
View file

@ -9,14 +9,21 @@ const cp = require("node:child_process");
const nodeFlags = "--experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-warnings --no-deprecation"; const nodeFlags = "--experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-warnings --no-deprecation";
// Prepare platform-dependent commands // Define platform-dependent commands
const pcmd = {
// Older MacOS versions don't come with `sha256sum`, but they all come with `shasum`
sha256sum: process.platform === "darwin" ? "shasum -a 256" : "sha256sum",
// Older MacOS versions don't come with `sha256sum`, but they all come with `shasum` // MacOS (and FreeBSD, but not OpenBSD) require an argument to `-i`.
const sha256sumCmd = process.platform === "darwin" ? "shasum -a 256" : "sha256sum"; // However, users may have installed GNU sed, so let's check what `sed` says itself.
// NB: using a lazy, memoized getter so this is only executed at most once, upon first access.
// MacOS (and FreeBSD, but not OpenBSD) require an argument to `-i`. get sed() {
// However, users may have installed GNU sed, so let's check what `sed` says itself. delete this.sed;
const sedCmd = cp.execSync("sed -i 2>&1 | head -n1").toString().includes("option requires an argument") ? "sed -i ''" : "sed -i"; return this.sed = (
cp.execSync("sed -i 2>&1 | head -n1").toString().includes("option requires an argument") ? "sed -i ''" : "sed -i"
);
}
};
/** /**
* Grunt configuration for building the app in various formats. * Grunt configuration for building the app in various formats.
@ -340,8 +347,8 @@ module.exports = function (grunt) {
exec: { exec: {
calcDownloadHash: { calcDownloadHash: {
command: chainCommands([ command: chainCommands([
`${sha256sumCmd} build/prod/CyberChef_v${pkg.version}.zip | awk '{print $1;}' > build/prod/sha256digest.txt`, `${pcmd.sha256sum} build/prod/CyberChef_v${pkg.version}.zip | awk '{print $1;}' > build/prod/sha256digest.txt`,
`${sedCmd} -e "s/DOWNLOAD_HASH_PLACEHOLDER/$(cat build/prod/sha256digest.txt)/" build/prod/index.html`, `${pcmd.sed} -e "s/DOWNLOAD_HASH_PLACEHOLDER/$(cat build/prod/sha256digest.txt)/" build/prod/index.html`,
]), ]),
}, },
repoSize: { repoSize: {
@ -411,15 +418,15 @@ module.exports = function (grunt) {
stdout: false, stdout: false,
}, },
fixCryptoApiImports: { fixCryptoApiImports: {
command: `find ./node_modules/crypto-api/src/ \\( -type d -name .git -prune \\) -o -type f -print0 | xargs -0 ${sedCmd} -e '/\\.mjs/!s/\\(from "\\.[^"]*\\)";/\\1.mjs";/g'`, command: `find ./node_modules/crypto-api/src/ \\( -type d -name .git -prune \\) -o -type f -print0 | xargs -0 ${pcmd.sed} -e '/\\.mjs/!s/\\(from "\\.[^"]*\\)";/\\1.mjs";/g'`,
stdout: false stdout: false
}, },
fixSnackbarMarkup: { fixSnackbarMarkup: {
command: `${sedCmd} 's/<div id=snackbar-container\\/>/<div id=snackbar-container>/g' ./node_modules/snackbarjs/src/snackbar.js`, command: `${pcmd.sed} 's/<div id=snackbar-container\\/>/<div id=snackbar-container>/g' ./node_modules/snackbarjs/src/snackbar.js`,
stdout: false stdout: false
}, },
fixJimpModule: { fixJimpModule: {
command: `${sedCmd} 's/"es\\/index.js",/"es\\/index.js" ,\\n "type": "module",/' ./node_modules/jimp/package.json`, command: `${pcmd.sed} 's/"es\\/index.js",/"es\\/index.js" ,\\n "type": "module",/' ./node_modules/jimp/package.json`,
stdout: false stdout: false
} }
}, },