From 16f7d08bcaf01c40ccaad688a8709bfced68b10e Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Tue, 26 Apr 2022 22:50:50 +0200
Subject: Use losetup -d instead of --detach and add clean up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 element-desktop/bash-aliases | 3 ++-
 signal-desktop/bash-aliases  | 3 ++-
 wire-desktop/bash-aliases    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/element-desktop/bash-aliases b/element-desktop/bash-aliases
index 5689df2..fa8afea 100644
--- a/element-desktop/bash-aliases
+++ b/element-desktop/bash-aliases
@@ -14,6 +14,7 @@ umount-element () {
 	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" ELEMENT_DIR=~/.var/opt/element sh -c '
 		umount "${ELEMENT_DIR}/ElementCrypt.d"
 		cryptsetup close ElementCrypt
-		losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/ElementCrypt")"
+		losetup -d "$(cat -- "${XDG_RUNTIME_DIR}/ElementCrypt")"
+		rm -f -- "${XDG_RUNTIME_DIR}/ElementCrypt"
 		'
 }
diff --git a/signal-desktop/bash-aliases b/signal-desktop/bash-aliases
index 0404b2c..a2669ab 100644
--- a/signal-desktop/bash-aliases
+++ b/signal-desktop/bash-aliases
@@ -14,6 +14,7 @@ umount-signal () {
 	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" SIGNAL_DIR=~/.var/opt/signal sh -c '
 		umount "${SIGNAL_DIR}/SignalCrypt.d"
 		cryptsetup close SignalCrypt
-		losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/SignalCrypt")"
+		losetup -d "$(cat -- "${XDG_RUNTIME_DIR}/SignalCrypt")"
+		rm -f -- "${XDG_RUNTIME_DIR}/SignalCrypt"
 		'
 }
diff --git a/wire-desktop/bash-aliases b/wire-desktop/bash-aliases
index 09f4733..0fe1b9e 100644
--- a/wire-desktop/bash-aliases
+++ b/wire-desktop/bash-aliases
@@ -14,6 +14,7 @@ umount-wire () {
 	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/opt/wire sh -c '
 		umount "${WIRE_DIR}/WireCrypt.d"
 		cryptsetup close WireCrypt
-		losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/WireCrypt")"
+		losetup -d "$(cat -- "${XDG_RUNTIME_DIR}/WireCrypt")"
+		rm -f -- "${XDG_RUNTIME_DIR}/WireCrypt"
 		'
 }
-- 
cgit v1.2.3-70-g09d2