From 040374e781dddf1fee8f67ed7a308a8c04f09cd2 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Fri, 5 Mar 2021 12:53:21 +0100
Subject: [PATCH] List volumes/secrets when removing

---
 abra | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/abra b/abra
index daf0bea..258f645 100755
--- a/abra
+++ b/abra
@@ -1130,24 +1130,31 @@ sub_app_delete (){
 
   rm "$ENV_FILE"
 
-  if [ "$abra___force" != "true" ] && [ "$abra___volumes" = "true" ]; then
-    warning "SCARY: About to remove all volumes associated with ${STACK_NAME}"
-    prompt_confirm
-  fi
-
   if [ "$abra___volumes" = "true" ]; then
-    # shellcheck disable=SC2086
-    docker volume rm --force "$(docker volume ls --filter "name=${STACK_NAME}" --quiet)"
+    volumes="$(docker volume ls --filter "name=${STACK_NAME}" --quiet)"
+
+    if [ "$abra___force" != "true" ] && [ "$abra___volumes" = "true" ]; then
+      # shellcheck disable=SC2086
+      warning "SCARY: About to remove all volumes associated with ${STACK_NAME}: $(echo $volumes | tr -d '\n')"
+
+      prompt_confirm
+    fi
+
+    docker volume rm --force "$volumes"
   fi
 
-  if [ "$abra___force" != "true" ] && [ "$abra___secrets" = "true" ]; then
-    warning "SCARY: About to remove all secrets associated with ${STACK_NAME}"
-    prompt_confirm
-  fi
 
   if [ "$abra___secrets" = "true" ]; then
-    # shellcheck disable=SC2086
-    docker secret rm "$(docker secret ls --filter "name=${STACK_NAME}" --quiet)"
+    secrets="$(docker secret ls --filter "name=${STACK_NAME}" --quiet)"
+
+    if [ "$abra___force" != "true" ] && [ "$abra___secrets" = "true" ]; then
+      # shellcheck disable=SC2086
+      warning "SCARY: About to remove all secrets associated with ${STACK_NAME}: $(echo $secrets | tr -d '\n')"
+
+      prompt_confirm
+    fi
+
+    docker secret rm "$secrets"
   fi
 }