From 4d12f4df0c62de4cf2360797ae3ea3de859fa259 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Thu, 1 Jun 2023 13:19:24 +0100 Subject: [PATCH] maint: use consistent make variable interpolation syntax * cfg.mk: Prefer $() interpolation over ${} lest the reader is confused as to whether shell interpolation, i.e. $${} was intended. --- cfg.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index 64db2bec48..a6d414cd75 100644 --- a/cfg.mk +++ b/cfg.mk @@ -197,7 +197,7 @@ error_fns = (error|die|diagnose) # on a separate line to the arguments, or the arguments in parenthesis. sc_error_quotes: @cd $(srcdir)/src \ - && GIT_PAGER= git grep -E -n '${error_fns} *\(.*%s.*, [^(]*\);$$' \ + && GIT_PAGER= git grep -E -n '$(error_fns) *\(.*%s.*, [^(]*\);$$' \ *.c | grep -v ', q' \ && { echo '$(ME): '"Use quote() for error string arguments" 1>&2; \ exit 1; } \ @@ -209,7 +209,7 @@ sc_error_quotes: sc_error_shell_quotes: @cd $(srcdir)/src && \ { GIT_PAGER= git grep -E \ - '${error_fns} \(.*%s[:"], .*(name|file)[^"]*\);$$' *.c; \ + '$(error_fns) \(.*%s[:"], .*(name|file)[^"]*\);$$' *.c; \ GIT_PAGER= git grep -E \ ' quote[ _].*file' *.c; } \ | grep -Ev '(quotef|q[^ ]*name)' \ @@ -223,13 +223,13 @@ sc_error_shell_quotes: # to provide better support for copy and paste. sc_error_shell_always_quotes: @cd $(srcdir)/src && GIT_PAGER= git grep -E \ - '${error_fns} \(.*[^:] %s[ "].*, .*(name|file)[^"]*\);$$' \ + '$(error_fns) \(.*[^:] %s[ "].*, .*(name|file)[^"]*\);$$' \ *.c | grep -Ev '(quoteaf|q[^ ]*name)' \ && { echo '$(ME): '"Use quoteaf() for space delimited names" 1>&2; \ exit 1; } \ || : @cd $(srcdir)/src && GIT_PAGER= git grep -E -A1 \ - '${error_fns} \([^%]*[^:] %s[ "]' *.c | grep 'quotef' \ + '$(error_fns) \([^%]*[^:] %s[ "]' *.c | grep 'quotef' \ && { echo '$(ME): '"Use quoteaf() for space delimited names" 1>&2; \ exit 1; } \ || : -- 2.47.2