summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-02-12 07:02:19 -0500
committerGitHub <noreply@github.com>2020-02-12 07:02:19 -0500
commitba547ec3a94b17cfb634758deb4cdbc98fc840a9 (patch)
tree7ec52eab5f49a885331816f4d0465ba880cc020a
parentMerge branch 'release-v1.10.0' into develop (diff)
downloadsynapse-ba547ec3a94b17cfb634758deb4cdbc98fc840a9.tar.xz
Use BSD-compatible in-place editing for sed. (#6887)
-rw-r--r--changelog.d/6887.misc1
-rwxr-xr-xscripts-dev/config-lint.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/6887.misc b/changelog.d/6887.misc
new file mode 100644
index 0000000000..b351d47c7b
--- /dev/null
+++ b/changelog.d/6887.misc
@@ -0,0 +1 @@
+Fix the use of sed in the linting scripts when using BSD sed.
diff --git a/scripts-dev/config-lint.sh b/scripts-dev/config-lint.sh
index 677a854c85..189ca66535 100755
--- a/scripts-dev/config-lint.sh
+++ b/scripts-dev/config-lint.sh
@@ -3,7 +3,8 @@
 # Exits with 0 if there are no problems, or another code otherwise.
 
 # Fix non-lowercase true/false values
-sed -i -E "s/: +True/: true/g; s/: +False/: false/g;" docs/sample_config.yaml
+sed -i.bak -E "s/: +True/: true/g; s/: +False/: false/g;" docs/sample_config.yaml
+rm docs/sample_config.yaml.bak
 
 # Check if anything changed
 git diff --exit-code docs/sample_config.yaml