Fix misc `shellcheck` complaints

diff --git a/ci/check-compiles.sh b/ci/check-compiles.sh
index 2fe62be787ed60e95fe45af20651d3fc63843a42..7ad9f4df1961cf0b112ef2ce810438d45d14cd4f 100755 (executable)
--- a/ci/check-compiles.sh
+++ b/ci/check-compiles.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 set -x
-echo Testing $(git log -1 --oneline)
+echo "Testing $(git log -1 --oneline)"
 cargo check
 cargo doc
 cargo doc --document-private-items

diff --git a/ci/check-each-commit.sh b/ci/check-each-commit.sh
index e4723c837ede02fb0835d919fddd4757c9159bc0..42e3d0e76e26e15a92af03c44deb816ff068f8b4 100755 (executable)
--- a/ci/check-each-commit.sh
+++ b/ci/check-each-commit.sh
@@ -12,4 +12,4 @@ if [ "$(git log --pretty="%H %D" | grep "^[0-9a-f]*.* $1")" = "" ]; then
        echo "It seems like the current checked-out commit is not based on $1"
        exit 1
 fi
-git rebase --exec ci/check-compiles.sh $1
+git rebase --exec ci/check-compiles.sh "$1"

diff --git a/ci/rustfmt.sh b/ci/rustfmt.sh
index 56384aae3c5b8c5024e21b9f807dacacf2618558..1a9053a28dd6fe2ee36a2c4ad3ed9e168faf24a9 100755 (executable)
--- a/ci/rustfmt.sh
+++ b/ci/rustfmt.sh
@@ -14,8 +14,8 @@ VERS=""
 
 # Run fmt
 TMP_FILE=$(mktemp)
-find . -name '*.rs' -type f |sort >$TMP_FILE
-for file in $(comm -23 $TMP_FILE rustfmt_excluded_files); do
+find . -name '*.rs' -type f |sort >"$TMP_FILE"
+for file in $(comm -23 "$TMP_FILE" rustfmt_excluded_files); do
        echo "Checking formatting of $file"
-       rustfmt $VERS --edition 2021 --check $file
+       rustfmt $VERS --edition 2021 --check "$file"
 done

diff --git a/contrib/download_bitcoind_electrs.sh b/contrib/download_bitcoind_electrs.sh
index 03132330086ccf32a179e9b59845cd5a1905079f..8b938a563d379d30c330fe4a90c4edafda245dc8 100755 (executable)
--- a/contrib/download_bitcoind_electrs.sh
+++ b/contrib/download_bitcoind_electrs.sh
@@ -22,7 +22,8 @@ elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
        BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
        BITCOIND_DL_HASH="1acfde0ec3128381b83e3e5f54d1c7907871d324549129592144dd12a821eff1"
 else
-       echo "\n\nUnsupported platform: $HOST_PLATFORM Exiting.."
+       printf "\n\n"
+       echo "Unsupported platform: $HOST_PLATFORM Exiting.."
        exit 1
 fi
 

diff --git a/contrib/run-rustfmt.sh b/contrib/run-rustfmt.sh
index 823e9e025b61fd63a7036f31aee87db57b9a9846..ffce4242f3ef24d5b5678436eba155ad6b403213 100755 (executable)
--- a/contrib/run-rustfmt.sh
+++ b/contrib/run-rustfmt.sh
@@ -14,8 +14,8 @@ VERS=""
 
 # Run fmt
 TMP_FILE=$(mktemp)
-find . -name '*.rs' -type f |sort >$TMP_FILE
-for file in $(comm -23 $TMP_FILE rustfmt_excluded_files); do
+find . -name '*.rs' -type f |sort >"$TMP_FILE"
+for file in $(comm -23 "$TMP_FILE" rustfmt_excluded_files); do
        echo "Formatting $file..."
-       rustfmt $VERS --edition 2021 $file
+       rustfmt $VERS --edition 2021 "$file"
 done