diff --git a/lib/mrsk/cli/accessory.rb b/lib/mrsk/cli/accessory.rb index ba2e8a5a..d0037cd4 100644 --- a/lib/mrsk/cli/accessory.rb +++ b/lib/mrsk/cli/accessory.rb @@ -153,9 +153,7 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question" def remove(name) if name == "all" - if options[:confirmed] || ask("This will remove all containers and images for all accessories. Are you sure?", limited_to: %w( y N ), default: "N") == "y" - MRSK.accessory_names.each { |accessory_name| remove(accessory_name) } - end + MRSK.accessory_names.each { |accessory_name| remove(accessory_name) } else if options[:confirmed] || ask("This will remove all containers and images for #{name}. Are you sure?", limited_to: %w( y N ), default: "N") == "y" with_accessory(name) do diff --git a/lib/mrsk/cli/main.rb b/lib/mrsk/cli/main.rb index 9f21f350..d77798f6 100644 --- a/lib/mrsk/cli/main.rb +++ b/lib/mrsk/cli/main.rb @@ -143,7 +143,7 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base desc "remove", "Remove Traefik, app, accessories, and registry session from servers" option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question" def remove - if options[:confirmed] || ask(remove_confirmation_question, limited_to: %w( y N ), default: "N") == "y" + if options[:confirmed] || ask("This will remove all containers and images. Are you sure?", limited_to: %w( y N ), default: "N") == "y" invoke "mrsk:cli:traefik:remove", [], options.without(:confirmed) invoke "mrsk:cli:app:remove", [], options.without(:confirmed) invoke "mrsk:cli:accessory:remove", [ "all" ], options @@ -186,10 +186,4 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base on(host) { container_names = capture_with_info(*MRSK.app.list_container_names).split("\n") } Array(container_names).include?(container_name) end - - def remove_confirmation_question - "This will remove all containers and images. " + - (MRSK.config.accessories.any? ? "Including #{MRSK.config.accessories.collect(&:name).to_sentence}. " : "") + - "Are you sure?" - end end