Skip to content

Commit 534b290

Browse files
authored
Merge pull request #14071 from fzakaria/fzakaria/shellcheck-functional-db-migration
shellcheck fix functional/db-migration.sh
2 parents bdd3eb4 + 697c704 commit 534b290

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

maintainers/flake-module.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
enable = true;
107107
excludes = [
108108
# We haven't linted these files yet
109-
''^tests/functional/db-migration\.sh$''
110109
''^tests/functional/dump-db\.sh$''
111110
''^tests/functional/dyn-drv/eval-outputOf\.sh$''
112111
''^tests/functional/dyn-drv/old-daemon-error-hack\.sh$''

tests/functional/db-migration.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ PATH_WITH_NEW_NIX="$PATH"
1919
export PATH="${NIX_DAEMON_PACKAGE}/bin:$PATH"
2020
clearStore
2121
nix-build simple.nix --no-out-link
22-
nix-store --generate-binary-cache-key cache1.example.org $TEST_ROOT/sk1 $TEST_ROOT/pk1
22+
nix-store --generate-binary-cache-key cache1.example.org "$TEST_ROOT/sk1" "$TEST_ROOT/pk1"
2323
dependenciesOutPath=$(nix-build dependencies.nix --no-out-link --secret-key-files "$TEST_ROOT/sk1")
2424
fixedOutPath=$(IMPURE_VAR1=foo IMPURE_VAR2=bar nix-build fixed.nix -A good.0 --no-out-link)
2525

2626
# Migrate to the new schema and ensure that everything's there
2727
export PATH="$PATH_WITH_NEW_NIX"
28-
info=$(nix path-info --json $dependenciesOutPath)
28+
info=$(nix path-info --json "$dependenciesOutPath")
2929
[[ $info =~ '"ultimate":true' ]]
30+
# shellcheck disable=SC2076
3031
[[ $info =~ 'cache1.example.org' ]]
3132
nix verify -r "$fixedOutPath"
32-
nix verify -r "$dependenciesOutPath" --sigs-needed 1 --trusted-public-keys $(cat $TEST_ROOT/pk1)
33+
nix verify -r "$dependenciesOutPath" --sigs-needed 1 --trusted-public-keys "$(cat "$TEST_ROOT/pk1")"

0 commit comments

Comments
 (0)