From 6cf66b1603fb38c1c2aac2e123257bf627b5df5b Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Mon, 19 Dec 2016 16:58:17 +0000 Subject: [PATCH] Make sure that we clean up any schroot sessions when we exit --- strace-build-test | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/strace-build-test b/strace-build-test index 4d2a499..8e549a0 100755 --- a/strace-build-test +++ b/strace-build-test @@ -42,13 +42,19 @@ set -x mysid=sid-93sam-strace-$RANDOM +cleanup () { + schroot -e -c $mysid +} + +trap 0 cleanup + BASE_CHROOT="sid_$ARCH-dchroot" schroot -e -c $mysid || true schroot -b -c $BASE_CHROOT -n $mysid dd-schroot-cmd -y -c $mysid apt-get update dd-schroot-cmd -y -c $mysid apt-get build-dep strace -dd-schroot-cmd -y -c $mysid apt-get install git autotools-dev gawk dh-autoreconf +dd-schroot-cmd -y -c $mysid apt-get install git autotools-dev gawk dh-autoreconf wget dd-schroot-cmd -y -c $mysid apt-get install gcc-multilib || true DATETIME=$(date -u '+%Y-%m-%d-%H%M%S') @@ -145,6 +151,3 @@ EOF steve@einval.com rm -f typescript fi - -schroot -e -c $mysid - -- 2.20.1