From 9966d6548992b2a2d7a0e57933d9ea5aa467083c Mon Sep 17 00:00:00 2001
From: Michael Wolf <maw@pobox.com>
Date: Wed, 20 Sep 2023 10:15:48 -0600
Subject: [PATCH] Make shellcheck happier

---
 isort-and-black.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/isort-and-black.sh b/isort-and-black.sh
index 4131f5f..c4089c1 100755
--- a/isort-and-black.sh
+++ b/isort-and-black.sh
@@ -9,33 +9,37 @@ source "$DIR/_reformat-common.bash"
 
 file="$1"
 
-if [[ x"$WOULD_REFORMAT" = x"would_reformat" ]] ; then
-    out1=$(pipx run isort $file 2>/dev/null)
+if [[ "$WOULD_REFORMAT" = "would_reformat" ]] ; then
+    out1=$(pipx run isort "$file" 2>/dev/null)
     c1="$?"
 
-    if [[ x"$c1" != x"0" ]] ; then
+    if [[ "$c1" != "0" ]] ; then
         # would reorder imports
-        if [[ x"$c1" = x"1" ]] ; then
+        if [[ "$c1" = "1" ]] ; then
             exit 1
         fi
         # syntax error; 123 is normalized to 2
-        if [[ x"$c1" = x"123" ]] ; then
+        if [[ "$c1" = "123" ]] ; then
             exit 2
         fi
         # some other problem that we don't know how to handle
         exit 255
     fi
 
-    out2=$(pipx run black --check $file 2>/dev/null)
+    out2=$(pipx run black --check "$file" 2>/dev/null)
     c2="$?"
 
+    printf '%s\n%s' "$out1" "$out2"
+
     exit "$c2"
 fi
 
-if [[ x"$WOULD_REFORMAT" = x"do_reformat" ]] ; then
-    out1=$(pipx run black $1 2>/dev/null && pipx run isort $file 2>/dev/null)
+if [[ "$WOULD_REFORMAT" = "do_reformat" ]] ; then
+    out1=$(pipx run black "$1" 2>/dev/null && pipx run isort "$file" 2>/dev/null)
     c="$?"
 
+    printf '%s\n' "$out1"
+
     exit "$c"
 fi