From 0ad48de69395d33f3556f525eae9eff13a5ea524 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 25 Oct 2023 11:20:46 -0400
Subject: [PATCH] use `|| eend $?` consistently in `cleanup` function

---
 grml-debootstrap | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/grml-debootstrap b/grml-debootstrap
index 51960e4..b9b298f 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -287,8 +287,7 @@ cleanup() {
         einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice."
       else
         einfo "Unmounting $MNTPOINT"
-        umount "$MNTPOINT"
-        eend $?
+        umount "$MNTPOINT" || eend $?
       fi
 
       if [ -n "$STAGES" ] ; then
@@ -299,21 +298,19 @@ cleanup() {
       # remove directory only if we used the default with process id inside the name
       if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
         einfo "Removing directory ${MNTPOINT}"
-        rmdir "$MNTPOINT"
-        eend $?
+        rmdir "$MNTPOINT" || eend $?
       fi
     fi
   fi
 
   if [ -n "${ORIG_TARGET}" ] ; then
     einfo "Removing loopback mount of file ${ORIG_TARGET}."
-    kpartx -d "${ORIG_TARGET}"
+    kpartx -d "${ORIG_TARGET}" || eend $?
     # Workaround for a bug in kpartx which doesn't clean up properly,
     # see Debian Bug #891077 and Github-PR grml/grml-debootstrap#112
     if dmsetup ls | grep -q "^${LOOP_PART} "; then
-      kpartx -d "/dev/${LOOP_DISK}" >/dev/null
+      kpartx -d "/dev/${LOOP_DISK}" >/dev/null || eend $?
     fi
-    eend $?
   fi
 }
 
-- 
2.1.4