Merge pull request #14082 from fzakaria/fzakaria/shellcheck-multiple

shellcheck: multiple file fixes

Author: Ericson2314

maintainers/flake-module.nix

@@ -107,16 +107,6 @@
             excludes = [
               # We haven't linted these files yet
               ''^tests/functional/dump-db\.sh$''
-              ''^tests/functional/dyn-drv/eval-outputOf\.sh$''
-              ''^tests/functional/dyn-drv/old-daemon-error-hack\.sh$''
-              ''^tests/functional/dyn-drv/recursive-mod-json\.sh$''
-              ''^tests/functional/eval-store\.sh$''
-              ''^tests/functional/export-graph\.sh$''
-              ''^tests/functional/export\.sh$''
-              ''^tests/functional/extra-sandbox-profile\.sh$''
-              ''^tests/functional/fetchClosure\.sh$''
-              ''^tests/functional/fetchGit\.sh$''
-              ''^tests/functional/fetchGitRefs\.sh$''
               ''^tests/functional/fetchGitSubmodules\.sh$''
               ''^tests/functional/fetchGitVerification\.sh$''
               ''^tests/functional/fetchMercurial\.sh$''

tests/functional/dyn-drv/old-daemon-error-hack.sh

@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 # Purposely bypassing our usual common for this subgroup
 source ../common.sh
 

tests/functional/dyn-drv/recursive-mod-json.sh

@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 source common.sh
 
 # FIXME
@@ -10,18 +11,18 @@ restartDaemon
 
 clearStore
 
-rm -f $TEST_ROOT/result
+rm -f "$TEST_ROOT"/result
 
-EXTRA_PATH=$(dirname $(type -p nix)):$(dirname $(type -p jq))
+EXTRA_PATH=$(dirname "$(type -p nix)"):$(dirname "$(type -p jq)")
 export EXTRA_PATH
 
 # Will produce a drv
 metaDrv=$(nix-instantiate ./recursive-mod-json.nix)
 
 # computed "dynamic" derivation
-drv=$(nix-store -r $metaDrv)
+drv=$(nix-store -r "$metaDrv")
 
 # build that dyn drv
-res=$(nix-store -r $drv)
+res=$(nix-store -r "$drv")
 
-grep 'I am alive!' $res/hello
+grep 'I am alive!' "$res"/hello

tests/functional/eval-store.sh

@@ -6,6 +6,7 @@ TODO_NixOS
 
 # Using `--eval-store` with the daemon will eventually copy everything
 # to the build store, invalidating most of the tests here
+# shellcheck disable=SC1111
 needLocalStore "“--eval-store” doesn't achieve much with the daemon"
 
 eval_store=$TEST_ROOT/eval-store
@@ -15,43 +16,43 @@ rm -rf "$eval_store"
 
 nix build -f dependencies.nix --eval-store "$eval_store" -o "$TEST_ROOT/result"
 [[ -e $TEST_ROOT/result/foobar ]]
-if [[ ! -n "${NIX_TESTS_CA_BY_DEFAULT:-}" ]]; then
+if [[ -z "${NIX_TESTS_CA_BY_DEFAULT:-}" ]]; then
     # Resolved CA derivations are written to store for building
     #
     # TODO when we something more systematic
     # (https://github.com/NixOS/nix/issues/5025) that distinguishes
     # between scratch storage for building and the final destination
     # store, we'll be able to make this unconditional again -- resolved
     # derivations should only appear in the scratch store.
-    (! ls $NIX_STORE_DIR/*.drv)
+    (! ls "$NIX_STORE_DIR"/*.drv)
 fi
-ls $eval_store/nix/store/*.drv
+ls "$eval_store"/nix/store/*.drv
 
 clearStore
 rm -rf "$eval_store"
 
 nix-instantiate dependencies.nix --eval-store "$eval_store"
-(! ls $NIX_STORE_DIR/*.drv)
-ls $eval_store/nix/store/*.drv
+(! ls "$NIX_STORE_DIR"/*.drv)
+ls "$eval_store"/nix/store/*.drv
 
 clearStore
 rm -rf "$eval_store"
 
 nix-build dependencies.nix --eval-store "$eval_store" -o "$TEST_ROOT/result"
 [[ -e $TEST_ROOT/result/foobar ]]
-if [[ ! -n "${NIX_TESTS_CA_BY_DEFAULT:-}" ]]; then
+if [[ -z "${NIX_TESTS_CA_BY_DEFAULT:-}" ]]; then
     # See above
-    (! ls $NIX_STORE_DIR/*.drv)
+    (! ls "$NIX_STORE_DIR"/*.drv)
 fi
-ls $eval_store/nix/store/*.drv
+ls "$eval_store"/nix/store/*.drv
 
 clearStore
 rm -rf "$eval_store"
 
 # Confirm that import-from-derivation builds on the build store
 [[ $(nix eval --eval-store "$eval_store?require-sigs=false" --impure --raw --file ./ifd.nix) = hi ]]
-ls $NIX_STORE_DIR/*dependencies-top/foobar
-(! ls $eval_store/nix/store/*dependencies-top/foobar)
+ls "$NIX_STORE_DIR"/*dependencies-top/foobar
+(! ls "$eval_store"/nix/store/*dependencies-top/foobar)
 
 # Can't write .drv by default
 (! nix-instantiate dependencies.nix --eval-store "dummy://")

tests/functional/export-graph.sh

@@ -8,27 +8,29 @@ clearStore
 clearProfiles
 
 checkRef() {
-    nix-store -q --references $TEST_ROOT/result | grepQuiet "$1"'$' || fail "missing reference $1"
+    nix-store -q --references "$TEST_ROOT"/result | grepQuiet "$1"'$' || fail "missing reference $1"
 }
 
 # Test the export of the runtime dependency graph.
 
-outPath=$(nix-build ./export-graph.nix -A 'foo."bar.runtimeGraph"' -o $TEST_ROOT/result)
+outPath=$(nix-build ./export-graph.nix -A 'foo."bar.runtimeGraph"' -o "$TEST_ROOT"/result)
 
-test $(nix-store -q --references $TEST_ROOT/result | wc -l) = 3 || fail "bad nr of references"
+test "$(nix-store -q --references "$TEST_ROOT"/result | wc -l)" = 3 || fail "bad nr of references"
 
 checkRef input-2
-for i in $(cat $outPath); do checkRef $i; done
+# shellcheck disable=SC2013
+for i in $(cat "$outPath"); do checkRef "$i"; done
 
 # Test the export of the build-time dependency graph.
 
 nix-store --gc # should force rebuild of input-1
 
-outPath=$(nix-build ./export-graph.nix -A 'foo."bar.buildGraph"' -o $TEST_ROOT/result)
+outPath=$(nix-build ./export-graph.nix -A 'foo."bar.buildGraph"' -o "$TEST_ROOT"/result)
 
 checkRef input-1
 checkRef input-1.drv
 checkRef input-2
 checkRef input-2.drv
 
-for i in $(cat $outPath); do checkRef $i; done
+# shellcheck disable=SC2013
+for i in $(cat "$outPath"); do checkRef "$i"; done

tests/functional/export.sh

@@ -8,33 +8,35 @@ clearStore
 
 outPath=$(nix-build dependencies.nix --no-out-link)
 
-nix-store --export $outPath > $TEST_ROOT/exp
+nix-store --export "$outPath" > "$TEST_ROOT"/exp
 
-nix-store --export $(nix-store -qR $outPath) > $TEST_ROOT/exp_all
+# shellcheck disable=SC2046
+nix-store --export $(nix-store -qR "$outPath") > "$TEST_ROOT"/exp_all
 
-if nix-store --export $outPath >/dev/full ; then
+if nix-store --export "$outPath" >/dev/full ; then
     echo "exporting to a bad file descriptor should fail"
     exit 1
 fi
 
 
 clearStore
 
-if nix-store --import < $TEST_ROOT/exp; then
+if nix-store --import < "$TEST_ROOT"/exp; then
     echo "importing a non-closure should fail"
     exit 1
 fi
 
 
 clearStore
 
-nix-store --import < $TEST_ROOT/exp_all
+nix-store --import < "$TEST_ROOT"/exp_all
 
-nix-store --export $(nix-store -qR $outPath) > $TEST_ROOT/exp_all2
+# shellcheck disable=SC2046
+nix-store --export $(nix-store -qR "$outPath") > "$TEST_ROOT"/exp_all2
 
 
 clearStore
 
 # Regression test: the derivers in exp_all2 are empty, which shouldn't
 # cause a failure.
-nix-store --import < $TEST_ROOT/exp_all2
+nix-store --import < "$TEST_ROOT"/exp_all2

tests/functional/fetchClosure.sh

@@ -17,25 +17,25 @@ requireDaemonNewerThan "2.16.0pre20230524"
 
 # Initialize binary cache.
 nonCaPath=$(nix build --json --file ./dependencies.nix --no-link | jq -r .[].outputs.out)
-caPath=$(nix store make-content-addressed --json $nonCaPath | jq -r '.rewrites | map(.) | .[]')
-nix copy --to file://$cacheDir $nonCaPath
+caPath=$(nix store make-content-addressed --json "$nonCaPath" | jq -r '.rewrites | map(.) | .[]')
+nix copy --to file://"$cacheDir" "$nonCaPath"
 
 # Test basic fetchClosure rewriting from non-CA to CA.
 clearStore
 
-[ ! -e $nonCaPath ]
-[ ! -e $caPath ]
+[ ! -e "$nonCaPath" ]
+[ ! -e "$caPath" ]
 
 [[ $(nix eval -v --raw --expr "
   builtins.fetchClosure {
     fromStore = \"file://$cacheDir\";
     fromPath = $nonCaPath;
     toPath = $caPath;
   }
-") = $caPath ]]
+") = "$caPath" ]]
 
-[ ! -e $nonCaPath ]
-[ -e $caPath ]
+[ ! -e "$nonCaPath" ]
+[ -e "$caPath" ]
 
 clearStore
 
@@ -55,7 +55,7 @@ if [[ "$NIX_REMOTE" != "daemon" ]]; then
     # TODO: Should the closure be rejected, despite single user mode?
     # [ ! -e $nonCaPath ]
 
-    [ ! -e $caPath ]
+    [ ! -e "$caPath" ]
 
     # We can use non-CA paths when we ask explicitly.
     [[ $(nix eval --raw --no-require-sigs --expr "
@@ -64,15 +64,15 @@ if [[ "$NIX_REMOTE" != "daemon" ]]; then
         fromPath = $nonCaPath;
         inputAddressed = true;
       }
-    ") = $nonCaPath ]]
+    ") = "$nonCaPath" ]]
 
-    [ -e $nonCaPath ]
-    [ ! -e $caPath ]
+    [ -e "$nonCaPath" ]
+    [ ! -e "$caPath" ]
 
 
 fi
 
-[ ! -e $caPath ]
+[ ! -e "$caPath" ]
 
 # 'toPath' set to empty string should fail but print the expected path.
 expectStderr 1 nix eval -v --json --expr "
@@ -84,39 +84,41 @@ expectStderr 1 nix eval -v --json --expr "
 " | grep "error: rewriting.*$nonCaPath.*yielded.*$caPath"
 
 # If fromPath is CA, then toPath isn't needed.
-nix copy --to file://$cacheDir $caPath
+nix copy --to file://"$cacheDir" "$caPath"
 
 clearStore
 
-[ ! -e $caPath ]
+[ ! -e "$caPath" ]
 
 [[ $(nix eval -v --raw --expr "
   builtins.fetchClosure {
     fromStore = \"file://$cacheDir\";
     fromPath = $caPath;
   }
-") = $caPath ]]
+") = "$caPath" ]]
 
-[ -e $caPath ]
+[ -e "$caPath" ]
 
 # Check that URL query parameters aren't allowed.
 clearStore
 narCache=$TEST_ROOT/nar-cache
-rm -rf $narCache
+rm -rf "$narCache"
 (! nix eval -v --raw --expr "
   builtins.fetchClosure {
     fromStore = \"file://$cacheDir?local-nar-cache=$narCache\";
     fromPath = $caPath;
   }
 ")
-(! [ -e $narCache ])
+# shellcheck disable=SC2235
+(! [ -e "$narCache" ])
 
 # If toPath is specified but wrong, we check it (only) when the path is missing.
 clearStore
 
-badPath=$(echo $caPath | sed -e 's!/store/................................-!/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-!')
+# shellcheck disable=SC2001
+badPath=$(echo "$caPath" | sed -e 's!/store/................................-!/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-!')
 
-[ ! -e $badPath ]
+[ ! -e "$badPath" ]
 
 expectStderr 1 nix eval -v --raw --expr "
   builtins.fetchClosure {
@@ -126,19 +128,19 @@ expectStderr 1 nix eval -v --raw --expr "
   }
 " | grep "error: rewriting.*$nonCaPath.*yielded.*$caPath.*while.*$badPath.*was expected"
 
-[ ! -e $badPath ]
+[ ! -e "$badPath" ]
 
 # We only check it when missing, as a performance optimization similar to what we do for fixed output derivations. So if it's already there, we don't check it.
 # It would be nice for this to fail, but checking it would be too(?) slow.
-[ -e $caPath ]
+[ -e "$caPath" ]
 
 [[ $(nix eval -v --raw --expr "
   builtins.fetchClosure {
     fromStore = \"file://$cacheDir\";
     fromPath = $badPath;
     toPath = $caPath;
   }
-") = $caPath ]]
+") = "$caPath" ]]
 
 
 # However, if the output address is unexpected, we can report it