Always trap

app/app

@@ -3,6 +3,7 @@ set -e
 APP_CMD="$(realpath "$BASH_SOURCE")"
 APP_DIR="$(dirname "$APP_CMD")"
 source "$APP_DIR/env"
+source "$APP_DIR/cmd/trap"
 
 echo "Locking '/run/$APP_NAME/lock' ..." >&2
 mkdir -p "/run/$APP_NAME"

app/cmd/eject

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -e
-source "$APP_DIR/cmd/trap"
 eval "$(bash "$APP_DIR/cmd/main" plist "$2")"
 if ! [ "$mm_type" = "disk" ]; then
 	echo "$mm_path is not a disk." >&2

app/cmd/mount

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -e
-source "$APP_DIR/cmd/trap"
 eval "$(bash "$APP_DIR/cmd/main" plist "$2")"
 
 if [ "$mm_format" = "crypto_LUKS" ]; then

app/cmd/umount

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -e
-source "$APP_DIR/cmd/trap"
 eval "$(bash "$APP_DIR/cmd/main" plist "$2")"
 
 if [ "$mm_format" = "crypto_LUKS" ]; then