From b9e6f84627b2f79cfabcba2bbc929fc7980d3bff Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Fri, 9 Dec 2016 16:34:30 -0800
Subject: [PATCH] remove references to the script plugin

---
 certbot/cli.py               | 5 +----
 certbot/plugins/selection.py | 4 +---
 setup.py                     | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/certbot/cli.py b/certbot/cli.py
index d327240f4..4cef6218f 100644
--- a/certbot/cli.py
+++ b/certbot/cli.py
@@ -81,7 +81,6 @@ USAGE = SHORT_USAGE + """Choice of server plugins for obtaining and installing c
   --standalone      Run a standalone webserver for authentication
   %s
   --webroot         Place files in a server's webroot folder for authentication
-  --script          User provided shell scripts for authentication
 
 OR use different plugins to obtain (authenticate) the cert and then install it:
 
@@ -94,7 +93,7 @@ More detailed help:
 
    all, automation, paths, security, testing, or any of the subcommands or
    plugins (certonly, renew, install, register, nginx, apache, standalone,
-   webroot, script, etc.)
+   webroot, etc.)
 """
 
 
@@ -994,8 +993,6 @@ def _plugins_parsing(helpful, plugins):
                 help="Obtain and install certs using Nginx")
     helpful.add(["plugins", "certonly"], "--standalone", action="store_true",
                 help='Obtain certs using a "standalone" webserver.')
-    helpful.add(["plugins", "certonly"], "--script", action="store_true",
-                help='Obtain certs using shell script(s)')
     helpful.add(["plugins", "certonly"], "--manual", action="store_true",
                 help='Provide laborious manual instructions for obtaining a cert')
     helpful.add(["plugins", "certonly"], "--webroot", action="store_true",
diff --git a/certbot/plugins/selection.py b/certbot/plugins/selection.py
index ed0991a89..8f371f586 100644
--- a/certbot/plugins/selection.py
+++ b/certbot/plugins/selection.py
@@ -131,7 +131,7 @@ def choose_plugin(prepared, question):
         else:
             return None
 
-noninstaller_plugins = ["webroot", "manual", "standalone", "script"]
+noninstaller_plugins = ["webroot", "manual", "standalone"]
 
 def record_chosen_plugins(config, plugins, auth, inst):
     "Update the config entries to reflect the plugins we actually selected."
@@ -236,8 +236,6 @@ def cli_plugin_requests(config):
         req_auth = set_configurator(req_auth, "webroot")
     if config.manual:
         req_auth = set_configurator(req_auth, "manual")
-    if config.script:
-        req_auth = set_configurator(req_auth, "script")
     logger.debug("Requested authenticator %s and installer %s", req_auth, req_inst)
     return req_auth, req_inst
 
diff --git a/setup.py b/setup.py
index 46dbdac81..4227d5d92 100644
--- a/setup.py
+++ b/setup.py
@@ -131,7 +131,6 @@ setup(
             'null = certbot.plugins.null:Installer',
             'standalone = certbot.plugins.standalone:Authenticator',
             'webroot = certbot.plugins.webroot:Authenticator',
-            'script = certbot.plugins.script:Authenticator',
         ],
     },
 )