tests/update-db-compat: Some refactoring

We want the tree adjustment to be first-class program so we can run
it.  Setting its name as a variable makes this easier, too.

Also, now we keep $toplevel, we can use it in a couple of plaxes.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 9 insertions, 3 deletions

diff --git a/tests/update-dh-compat b/tests/update-dh-compat
index 8abe49c..0c6516f 100755
--- a/tests/update-dh-compat
+++ b/tests/update-dh-compat
@@ -23,15 +23,19 @@ set -e
 
 # This ad-hoc script was wrtten to deal with #1002927.
 
+toplevel=$PWD
+
 cd_fresh_d () {
+    cd "$toplevel"
     rm -rf d
     mkdir d
     cd d
 }
 
-adjust () {
-    perl -i -pe 's/^5$/12/' debian/compat
-}
+adjust="$toplevel"/tests/update-dh-compat-adjust
+adjust () { "$adjust"; }
+
+cd "$toplevel"
 
 for f in tests/pkg-srcs/*.dsc; do
     cd_fresh_d
@@ -47,4 +51,6 @@ for f in tests/pkg-srcs/*.dsc; do
     cd ..
 done
 
+cd "$toplevel"
+
 rm -rf d