From c47b99a8c1bffcafc7ce5713c4cc69224b4c5f9d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 22 Feb 2020 11:25:22 +0100
Subject: [PATCH] Always stop db container when start-db exits

---
 programs/direnv/shells/dodona.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/programs/direnv/shells/dodona.nix b/programs/direnv/shells/dodona.nix
index 4553e16b..e2338b8c 100644
--- a/programs/direnv/shells/dodona.nix
+++ b/programs/direnv/shells/dodona.nix
@@ -11,20 +11,11 @@ in
       (pkgs.writeScriptBin "start-db" ''
         #!${pkgs.zsh}/bin/zsh
 
-        _sighandler() {
-          docker stop dodona-db
-        }
-
-        trap _sighandler SIGINT
-        trap _sighandler SIGTERM
-        trap _sighandler SIGHUP
-
+        trap "docker stop dodona-db" 0
         docker run --name dodona-db -p 3306:3306 --rm -v $(git rev-parse --show-toplevel)/tmp/db:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest &
 
         child=$!
         wait $child
-        # We wait two times, because the first wait exits when the process receives a signal. The process might have finished though, so we ignore errors.
-        wait $child 2>/dev/null
       '')
     ];
     shellHook = ''