From 032f32f132e35c651f49f175d48d9e96468b0c2f Mon Sep 17 00:00:00 2001
From: Michael Wolf <maw@pobox.com>
Date: Sat, 30 Sep 2023 15:30:23 -0600
Subject: [PATCH] Make shellcheck happier

---
 _reformat-common.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/_reformat-common.bash b/_reformat-common.bash
index 4aa9c56..4721b45 100644
--- a/_reformat-common.bash
+++ b/_reformat-common.bash
@@ -16,10 +16,10 @@ OPERATING_SYSTEM=$(get_os)
 
 # For a given file, return its corresponding project root.
 function project_root() {
-    pushd $(dirname "$1") 2>&1 >/dev/null
+    pushd "$(dirname "$1")" >/dev/null 2>&1 || exit 101
     out=$(git rev-parse --show-toplevel)
     ret="$?"
-    popd 2>&1 >/dev/null
+    popd >/dev/null 2>&1 || exit 1
 
     if [[ "$ret" != "0" ]]; then
         echo -n ""
@@ -35,12 +35,12 @@ function project_root() {
 wf_root() {
     arg=$(pwd)/bin/would-reformat.sh
 
-    pr=$(project_root $arg)
+    pr=$(project_root "$arg")
 
     link="$pr/bin/would-reformat.sh"
 
     original0=$(resolve_symlink "$link")
-    original=$(normalize_dir_of_file $original0)
+    original=$(normalize_dir_of_file "$original0")
 
     out="$original"