Appease the new formatter

Which currently misbehaves because of numtide/treefmt-nix#96.

Author: sellout

README.md

@@ -56,6 +56,7 @@ inputs = {
   ...
 };
 ```
+
 Make `strict-bash` and `strict-mode.bash` available to your derivations.
 
 ```nix
@@ -104,13 +105,14 @@ contents of this file change. By using `source`, all of your scripts are checked
 against a consistent strict mode.
 
 Now, to the behavior of this “strict mode”:
-* `set -e` / `-o errexit`: exit immediately if any command has a non-zero exit;
-* `set -u` / `-o nounset`: references to undefined variables are an error;
-* `set -o pipefail`: if a command that is not the end of the a pipeline (`|`)
-   fails, fail the whole pipeline;
-* `shopt -s inherit_errexit`: If a subshell (`$()`) fails, fail the calling
-   shell; and
-* `trap … ERR`: When an error occurs, report _where_ it occurred.
+
+- `set -e` / `-o errexit`: exit immediately if any command has a non-zero exit;
+- `set -u` / `-o nounset`: references to undefined variables are an error;
+- `set -o pipefail`: if a command that is not the end of the a pipeline (`|`)
+  fails, fail the whole pipeline;
+- `shopt -s inherit_errexit`: If a subshell (`$()`) fails, fail the calling
+  shell; and
+- `trap … ERR`: When an error occurs, report _where_ it occurred.
 
 ## FAQ
 
@@ -162,27 +164,29 @@ Combining the two is also an option, and should ensure that the disabling is sco
 
 There are other useful things to include in a script preface, but they
 aren’t included here for various reasons:
-* `IFS=$'\n\t'`: remove space as a field separator – often you want spaces
+
+- `IFS=$'\n\t'`: remove space as a field separator – often you want spaces
   preserved, and only newlines or tabs to be used to separate fields. This
   eliminates a common mistake, but it doesn’t actually make Bash catch any
   additional bad behavior, so it’s not part of this strict mode.
-* `LC_ALL=C`: remove locale-dependence from the script. This is usually what
+- `LC_ALL=C`: remove locale-dependence from the script. This is usually what
   you want, but if it were part of strict mode, you would lose the value
   before you could decide you want to keep it, so it’s not included here.
 
 ## resources
 
-* [Use Bash Strict Mode (Unless You Love Debugging)](http://redsymbol.net/articles/unofficial-bash-strict-mode/)
-* [Bash strict mode and why you should care](https://olivergondza.github.io/2019/10/01/bash-strict-mode.html)
-* [Fail Fast Bash Scripting](https://dougrichardson.us/notes/fail-fast-bash-scripting.html)
-
+- [Use Bash Strict Mode (Unless You Love Debugging)](http://redsymbol.net/articles/unofficial-bash-strict-mode/)
+- [Bash strict mode and why you should care](https://olivergondza.github.io/2019/10/01/bash-strict-mode.html)
+- [Fail Fast Bash Scripting](https://dougrichardson.us/notes/fail-fast-bash-scripting.html)
 
-[^1]: Sourcing a file relative to the script is difficult. The second line is a
+[^1]:
+    Sourcing a file relative to the script is difficult. The second line is a
     compact way to do it fairly reliably. See [How do I get the directory where
     a Bash script is located from within the script
     itself?](https://stackoverflow.com/questions/59895) for a lot of discussion
     on this topic.
 
-[^2]: The variable `SCRIPTDIR` above was chosen for affinity with the special
+[^2]:
+    The variable `SCRIPTDIR` above was chosen for affinity with the special
     value that `shellcheck` uses to indicate an import relative to the script
     (however, the name that you use does not have to match `shellcheck`).

bin/strict-mode.bash

@@ -4,8 +4,8 @@ set \
   -o pipefail
 
 # `inherit_errexit` was only added in Bash 4.4, and MacOS still includes 3.2.
-[[ "${BASH_VERSINFO[0]}" -ge 4 && "${BASH_VERSINFO[1]}" -ge 4 ]] \
-  && shopt -s inherit_errexit
+[[ ${BASH_VERSINFO[0]} -ge 4 && ${BASH_VERSINFO[1]} -ge 4 ]] &&
+  shopt -s inherit_errexit
 
 # shellcheck disable=SC2154 # `s` is assigned, but shellcheck can’t tell.
 trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR

default-builder.sh renamed to default-builder.bash

@@ -3,5 +3,6 @@
 ###       shouldn’t have to copy it, but I can’t find it in the store, so I’m at
 ###       a loss.
 
-source "${stdenv}/setup"
+# shellcheck disable=SC1091
+source "${stdenv:?}/setup"
 genericBuild

flake.nix

@@ -32,7 +32,7 @@
           ["-e" "${path}/bin/strict-bash"]
           ++ (
             if newArgs == []
-            then [./default-builder.sh]
+            then [./default-builder.bash]
             else newArgs
           );
       });

garnix.yaml

@@ -1,12 +1,12 @@
 builds:
   exclude: []
   include:
-    - '*.aarch64-linux'
-    - '*.aarch64-linux.*'
-    - '*.x86_64-linux'
-    - '*.x86_64-linux.*'
-    - '*.aarch64-darwin'
-    - '*.aarch64-darwin.*'
-    - '*.x86_64-darwin'
-    - '*.x86_64-darwin.*'
-    - 'nixosConfigurations.*'
+    - "*.aarch64-darwin"
+    - "*.aarch64-darwin.*"
+    - "*.aarch64-linux"
+    - "*.aarch64-linux.*"
+    - "*.x86_64-darwin"
+    - "*.x86_64-darwin.*"
+    - "*.x86_64-linux"
+    - "*.x86_64-linux.*"
+    - "homeConfigurations.*"

test/all-tests.bats

@@ -12,5 +12,5 @@ bats_require_minimum_version 1.5.0
   # Run from somewhere that we’re unlikely to find strict-mode.bash.
   cd "$TMPDIR"
   run -1 "$BATS_TEST_DIRNAME/is-on-path"
-  [[ "$output" =~ strict-mode\.bash:\ No\ such\ file\ or\ directory$ ]]
+  [[ $output =~ strict-mode\.bash:\ No\ such\ file\ or\ directory$ ]]
 }

test/generate

@@ -14,13 +14,13 @@ mkdir -p "${test_path}"
 cd "${template_path}" || exit 125
 for t in *; do
   old="${template_path}/${t}"
-  if [[ "${t}" =~ .*\.bash$ ]]; then
+  if [[ ${t} =~ .*\.bash$ ]]; then
     new="${test_path}/${t%.bash}"
     {
       cat "${test_path}.bash"
       echo
       cat "${old}"
-    } > "${new}"
+    } >"${new}"
     chmod +x "${new}"
   else
     new="${test_path}/${t}"

test/template/all-tests.bats

@@ -7,40 +7,40 @@ bats_require_minimum_version 1.5.0
 
 @test "failing subshell does" {
   run -1 "$BATS_TEST_DIRNAME/null-hypothesis2"
-  [[ "$output" =~ ^cat:\ nothing-here-man:\ No\ such\ file\ or\ directory &&
-    "$output" =~ Error\ on\ line &&
-    "$output" =~ :\ cat\ nothing-here-man ]]
+  [[ $output =~ ^cat:\ nothing-here-man:\ No\ such\ file\ or\ directory &&
+    $output =~ Error\ on\ line &&
+    $output =~ :\ cat\ nothing-here-man ]]
 }
 
 @test "set -e stops immediately" {
   run -1 "$BATS_TEST_DIRNAME/set-e"
-  [[ "$output" =~ ^cat:\ nothing-here-man:\ No\ such\ file\ or\ directory &&
-    "$output" =~ Error\ on\ line &&
-    "$output" =~ :\ cat\ nothing-here-man ]]
+  [[ $output =~ ^cat:\ nothing-here-man:\ No\ such\ file\ or\ directory &&
+    $output =~ Error\ on\ line &&
+    $output =~ :\ cat\ nothing-here-man ]]
 }
 
 @test "set -u catches undefined variables" {
   run -1 "$BATS_TEST_DIRNAME/set-u"
-  [[ "$output" =~ line &&
-    "$output" =~ :\ undefined:\ unbound\ variable ]]
+  [[ $output =~ line &&
+    $output =~ :\ undefined:\ unbound\ variable ]]
 }
 
 @test "set -o pipefail catches broken pipes" {
   run -1 "$BATS_TEST_DIRNAME/set-o-pipefail"
-  [[ "$output" =~ Error\ on\ line &&
-    "$output" =~ :\ cat ]]
+  [[ $output =~ Error\ on\ line &&
+    $output =~ :\ cat ]]
 }
 
 @test "shopt -s inherit_errexit catches broken subshells" {
   run -1 "$BATS_TEST_DIRNAME/shopt-s-inherit_errexit"
-  [[ "$output" =~ ^cat:\ nothing-here-man:\ No\ such\ file\ or\ directory &&
-    "$output" =~ Error\ on\ line &&
-    "$output" =~ :\ RESULT=\$\(cat\ nothing-here-man\) ]]
+  [[ $output =~ ^cat:\ nothing-here-man:\ No\ such\ file\ or\ directory &&
+    $output =~ Error\ on\ line &&
+    $output =~ :\ RESULT=\$\(cat\ nothing-here-man\) ]]
 }
 
 @test "inherit_errexit also pipefails" {
   run -1 "$BATS_TEST_DIRNAME/inherit_errexit-pipefail"
-  [[ "$output" =~ ^cat:\ nothing-here-man:\ No\ such\ file\ or\ directory &&
-    "$output" =~ Error\ on\ line &&
-    "$output" =~ :\ RESULT=\$\(cat\ nothing-here-man\ |\ cat\) ]]
+  [[ $output =~ ^cat:\ nothing-here-man:\ No\ such\ file\ or\ directory &&
+    $output =~ Error\ on\ line &&
+    $output =~ :\ RESULT=\$\(cat\ nothing-here-man\ |\ cat\) ]]
 }