From 2e7f07ebebd1b1f98e67d0f9ac122a49ca5d7638 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Wed, 16 Jan 2019 15:24:32 +0100 Subject: [PATCH] Fix warnings introduced in shellcheck v0.6.0 (Partial Merge: #15166) --- test/lint/lint-format-strings.sh | 28 ++++++++++++++-------------- test/lint/lint-whitespace.sh | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/lint/lint-format-strings.sh b/test/lint/lint-format-strings.sh index 2c443abf6b..c994ae3f4d 100755 --- a/test/lint/lint-format-strings.sh +++ b/test/lint/lint-format-strings.sh @@ -11,20 +11,20 @@ export LC_ALL=C FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS=( - FatalError,0 - fprintf,1 - LogConnectFailure,1 - LogPrint,1 - LogPrintf,0 - printf,0 - snprintf,2 - sprintf,1 - strprintf,0 - vfprintf,1 - vprintf,1 - vsnprintf,1 - vsprintf,1 - WalletLogPrintf,0 + "FatalError,0" + "fprintf,1" + "LogConnectFailure,1" + "LogPrint,1" + "LogPrintf,0" + "printf,0" + "snprintf,2" + "sprintf,1" + "strprintf,0" + "vfprintf,1" + "vprintf,1" + "vsnprintf,1" + "vsprintf,1" + "WalletLogPrintf,0" ) EXIT_CODE=0 diff --git a/test/lint/lint-whitespace.sh b/test/lint/lint-whitespace.sh index d5f3ca1cf4..98591719c6 100755 --- a/test/lint/lint-whitespace.sh +++ b/test/lint/lint-whitespace.sh @@ -23,7 +23,7 @@ while getopts "?" opt; do done if [ -z "${COMMIT_RANGE}" ]; then - if [ "$1" ]; then + if [ -n "$1" ]; then COMMIT_RANGE="HEAD~$1...HEAD" else COMMIT_RANGE="HEAD"