From c032cd08b3db3125ad92a7fb65dfd48cb6c6b1e2 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Sun, 27 Feb 2022 20:07:28 +0100
Subject: [PATCH] prisonparty: clean exit on sigterm/int

---
 bin/mtag/install-deps.sh | 2 +-
 bin/prisonparty.sh       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/mtag/install-deps.sh b/bin/mtag/install-deps.sh
index 352dec4e..72cabfd4 100755
--- a/bin/mtag/install-deps.sh
+++ b/bin/mtag/install-deps.sh
@@ -4,7 +4,7 @@ set -e
 
 # install dependencies for audio-*.py
 #
-# linux/alpine: requires {python3,ffmpeg,fftw}-dev py3-{wheel,pip} py3-numpy{,-dev} patchelf cmake
+# linux/alpine: requires gcc g++ make cmake patchelf {python3,ffmpeg,fftw,libsndfile}-dev py3-{wheel,pip} py3-numpy{,-dev}
 # linux/debian: requires libav{codec,device,filter,format,resample,util}-dev {libfftw3,python3}-dev python3-{numpy,pip} vamp-{plugin-sdk,examples} patchelf cmake
 # win64: requires msys2-mingw64 environment
 # macos: requires macports
diff --git a/bin/prisonparty.sh b/bin/prisonparty.sh
index a873bb01..a8b8da84 100755
--- a/bin/prisonparty.sh
+++ b/bin/prisonparty.sh
@@ -122,5 +122,7 @@ export LOGNAME="$USER"
 #echo "pybin [$pybin]"
 #echo "pyarg [$pyarg]"
 #echo "cpp [$cpp]"
-chroot --userspec=$uid:$gid "$jail" "$pybin" $pyarg "$cpp" "$@"
-
+chroot --userspec=$uid:$gid "$jail" "$pybin" $pyarg "$cpp" "$@" &
+p=$!
+trap 'kill $p' INT TERM
+wait