From 3acca04bb629e0f898f022fbbcaad78815aaaee3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 14 Jul 2022 01:30:19 -0600 Subject: have rebuilding the mappings use the scan-for-nodes result --- scripts/main.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/main.sh b/scripts/main.sh index e8d006d..a9afde3 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -1,7 +1,11 @@ #!/bin/bash -set -e +set -ex go build ./cmd/btrfs-rec if ! test -s ../scratch/dump.scan-for-nodes.json; then - time ./btrfs-rec --pv=../scratch/dump-zero.img inspect scan-for-nodes > ../scratch/dump.scan-for-nodes.json || - { r=$?; rm -f ../scratch/dump.scan-for-nodes.json; exit $r; } + time ./btrfs-rec --pv=../scratch/dump-zero.img inspect scan-for-nodes > ../scratch/dump.scan-for-nodes.json +fi +if ! test -s ../scratch/dump.rebuilt-mappings.json; then + time ./btrfs-rec --pv=../scratch/dump-zero.img inspect rebuild-mappings ../scratch/dump.scan-for-nodes.json \ + > ../scratch/dump.rebuilt-mappings.json \ + 2> >(tee >&2 ../scratch/dump.rebuilt-mappings.log) fi -- cgit v1.2.3-2-g168b