From 80326511bb1f0f7392f2c5bd259a74e3c6c0c195 Mon Sep 17 00:00:00 2001
From: Alex Bowers <bowersbros@gmail.com>
Date: Fri, 3 Mar 2017 18:28:05 +0000
Subject: [PATCH] Improve error reporting for hooks (#4235)

* Improve error reporting for hooks

* My bad

* Whitespace.
---
 certbot/hooks.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/certbot/hooks.py b/certbot/hooks.py
index 5cda478cc..ada3d3aaa 100644
--- a/certbot/hooks.py
+++ b/certbot/hooks.py
@@ -44,8 +44,12 @@ def validate_hook(shell_cmd, hook_name):
         cmd = shell_cmd.split(None, 1)[0]
         if not _prog(cmd):
             path = os.environ["PATH"]
-            msg = "Unable to find {2}-hook command {0} in the PATH.\n(PATH is {1})".format(
-                cmd, path, hook_name)
+            if os.path.exists(cmd):
+                msg = "{1}-hook command {0} exists, but is not executable.".format(cmd, hook_name)
+            else:
+                msg = "Unable to find {2}-hook command {0} in the PATH.\n(PATH is {1})".format(
+                    cmd, path, hook_name)
+
             raise errors.HookCommandNotFound(msg)
 
 def pre_hook(config):