From cca008f1409cdce5f1d872ed88fa9f79f3a2c6e7 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 5 May 2020 23:34:30 -0400
Subject: [PATCH] feat: remove all --force-yes usage throughout the codebase

It was deprecated in a recent apt release and shouldn't be necessary for anything any longer.

Closes #3949
---
 contrib/dokku-update                 |  2 +-
 docs/development/plugin-triggers.md  |  2 +-
 docs/getting-started/uninstalling.md | 12 ++++++------
 plugins/nginx-vhosts/dependencies    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/dokku-update b/contrib/dokku-update
index 9e7e601e3..200925fa1 100755
--- a/contrib/dokku-update
+++ b/contrib/dokku-update
@@ -81,7 +81,7 @@ main() {
       ;;
     debian | ubuntu)
       apt-get update -qq >/dev/null
-      apt-get -qq -y --force-yes dist-upgrade
+      apt-get -qq -y dist-upgrade
       ;;
     centos | opensuse | rhel)
       dokku-log-warn "Updating this operating system is not supported"
diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index d73ba8438..34f3785f3 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -327,7 +327,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 case "$DOKKU_DISTRO" in
   debian|ubuntu)
-    apt-get install --force-yes -qq -y nginx
+    apt-get install -qq -y nginx
     ;;
 
   opensuse)
diff --git a/docs/getting-started/uninstalling.md b/docs/getting-started/uninstalling.md
index dffe3f12a..eb396f320 100644
--- a/docs/getting-started/uninstalling.md
+++ b/docs/getting-started/uninstalling.md
@@ -2,31 +2,31 @@
 
 While we hate to see you go, if you need to uninstall Dokku, the following may help you out:
 
-## Arch Installation
+## Arch Uninstallation
 
 ```shell
 # purge dokku from your system
 yaourt -Rsn dokku
 ```
 
-## CentOS Installation
+## CentOS Uninstallation
 
 ```shell
 # uninstall dokku
 yum remove dokku herokuish
 ```
 
-## Debian Installation
+## Debian Uninstallation
 
 ```shell
 # purge dokku from your system
-apt-get purge -y --force-yes dokku herokuish
+apt-get purge dokku herokuish
 
 # remove any dependencies that are no longer necessary
-apt-get -y --force-yes autoremove
+apt-get autoremove
 ```
 
-## Makefile Installation
+## Makefile Uninstallation
 
 This is a manual deletion process, and as it is not a recommended installation method, there is currently no automated uninstallation.
 
diff --git a/plugins/nginx-vhosts/dependencies b/plugins/nginx-vhosts/dependencies
index 842aad16a..e8ea1b238 100755
--- a/plugins/nginx-vhosts/dependencies
+++ b/plugins/nginx-vhosts/dependencies
@@ -26,7 +26,7 @@ nginx_needs_upgrade() {
 nginx_install() {
   declare desc="install nginx and dnsutils"
   export DEBIAN_FRONTEND=noninteractive
-  apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -qq -y nginx dnsutils
+  apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -qq -y nginx dnsutils
 }
 
 trigger-nginx-vhosts-dependencies() {