Merge pull request #14179 from github/smowton/fix/go-baseline-quoting

smowton · web-flow · commit b291ee361a27 · 2023-09-11T15:54:24.000+01:00
Fix space handling in Golang configure-baseline scripts
diff --git a/go/codeql-tools/configure-baseline.cmd b/go/codeql-tools/configure-baseline.cmd
@@ -1,6 +1,6 @@
 @echo off
 if exist vendor\modules.txt (
-  type %CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-vendor.json
+  type "%CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-vendor.json"
 ) else (
-  type %CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-empty.json
+  type "%CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-empty.json"
 )
diff --git a/go/codeql-tools/configure-baseline.sh b/go/codeql-tools/configure-baseline.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -f vendor/modules.txt ]; then
-  cat $CODEQL_EXTRACTOR_GO_ROOT/tools/baseline-config-vendor.json
+  cat "$CODEQL_EXTRACTOR_GO_ROOT/tools/baseline-config-vendor.json"
 else
-  cat $CODEQL_EXTRACTOR_GO_ROOT/tools/baseline-config-empty.json
+  cat "$CODEQL_EXTRACTOR_GO_ROOT/tools/baseline-config-empty.json"
 fi

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`@echo off`
`2`	`2`	`if exist vendor\modules.txt (`
`3`		`- type %CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-vendor.json`
	`3`	`+ type "%CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-vendor.json"`
`4`	`4`	`) else (`
`5`		`- type %CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-empty.json`
	`5`	`+ type "%CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-empty.json"`
`6`	`6`	`)`