From: Mark Hansen <markhansen@google.com>
Date: Tue, 2 Mar 2021 08:59:20 +0000 (+1100)
Subject: Fix single-line color generation
X-Git-Tag: 2.47.0~13^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87bde4dae072f74cd92c7783a54fda1287183e05;p=graphviz

Fix single-line color generation

Looks like awk has actually added a `-s` flag in the last ten years, breaking this code! Amazing.

Fixes https://gitlab.com/graphviz/graphviz/-/issues/1967
---

diff --git a/doc/infosrc/Makefile b/doc/infosrc/Makefile
index dad08681a..39b1974f1 100644
--- a/doc/infosrc/Makefile
+++ b/doc/infosrc/Makefile
@@ -128,7 +128,7 @@ svg_colors.html : mkcolors.awk svg.awk ../../lib/common/svgcolor_names
 brewer_colors.html : mkcolors.awk brewer.awk ../../lib/common/brewer_colors
 	mkdir -p colortmp
 	awk -f brewer.awk ../../lib/common/brewer_colors
-	(for f in $$(ls colortmp); do awk -f mkcolors.awk -s colortmp/$$f; done) > brewer_colors.html
+	(for f in $$(ls colortmp); do awk -f mkcolors.awk --single-line colortmp/$$f; done) > brewer_colors.html
 	rm -rf colortmp
 
 colors.html : mkcolors.py x11_colors.html svg_colors.html brewer_colors.html
diff --git a/doc/infosrc/mkcolors.awk b/doc/infosrc/mkcolors.awk
index a6a470799..9945cfa15 100644
--- a/doc/infosrc/mkcolors.awk
+++ b/doc/infosrc/mkcolors.awk
@@ -15,7 +15,7 @@ function putColor (n, r, g, b, v)
 }
 BEGIN {
   colorsPerRow = 5;
-  if (ARGV[1] == "-s") {
+  if (ARGV[1] == "--single-line") {
     ARGV[1] = "";
     name = ARGV[2];
     singleRow = 1;