From 56b9871fae8428cd40a941af8561403362b82df5 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 16 Jun 2024 18:51:42 +0100 Subject: [PATCH 1/4] Replace bash commands with proper svgo cli Although this adds another requirement to execute this script, it will prevent OS-specific issues on `sed` and `grep` as described in #1503, and make sure anyone can generate the same SVG output files. `--pretty` is kept for convenience but can be removed if needed. --- generateModuleGraphs.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/generateModuleGraphs.sh b/generateModuleGraphs.sh index eacf19eed..483ea836f 100755 --- a/generateModuleGraphs.sh +++ b/generateModuleGraphs.sh @@ -31,6 +31,14 @@ then exit 1 fi +# Check if the svgo command is available +if ! command -v svgo &> /dev/null +then + echo "The 'svgo' command is not found. This is required to cleanup and compress SVGs." + echo "Installation instructions available at https://github.com/svg/svgo." + exit 1 +fi + # Check for a version of grep which supports Perl regex. # On MacOS the OS installed grep doesn't support Perl regex so check for the existence of the # GNU version instead which is prefixed with 'g' to distinguish it from the OS installed version. @@ -114,11 +122,10 @@ echo "$module_paths" | while read -r module_path; do -Pmodules.graph.of.module="${module_path}" /-->\x0/g' | grep -zv '^