From 621c8cd5c405211fb39f492e5f7266b6f96b6e5b Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Thu, 4 Mar 2021 19:21:38 +0100
Subject: [PATCH] Fix volume/secret deletion logic

- Fix escaping of quotes
- Dont delete things unless options are passed
---
 abra | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/abra b/abra
index 0fc488c..daf0bea 100755
--- a/abra
+++ b/abra
@@ -1135,16 +1135,20 @@ sub_app_delete (){
     prompt_confirm
   fi
 
-  # shellcheck disable=SC2086
-  docker volume rm --force "$(docker volume ls --filter \"name=${STACK_NAME}\" --quiet)"
+  if [ "$abra___volumes" = "true" ]; then
+    # shellcheck disable=SC2086
+    docker volume rm --force "$(docker volume ls --filter "name=${STACK_NAME}" --quiet)"
+  fi
 
   if [ "$abra___force" != "true" ] && [ "$abra___secrets" = "true" ]; then
     warning "SCARY: About to remove all secrets associated with ${STACK_NAME}"
     prompt_confirm
   fi
 
-  # shellcheck disable=SC2086
-  docker secret rm --force "$(docker secret ls --filter \"name=${STACK_NAME}\" --quiet)"
+  if [ "$abra___secrets" = "true" ]; then
+    # shellcheck disable=SC2086
+    docker secret rm "$(docker secret ls --filter "name=${STACK_NAME}" --quiet)"
+  fi
 }
 
 ###### .. app secret insert