scripts: Clean up finding asciidoc in asciidoc2html

I've also tried to add asciidoc3 support, but with its asciidoc3.conf and
asciidoc3_postinstall which creates ~/asciidoc3 (!) it doesn't really seem like
a drop-in replacement.

1 files changed, 10 insertions, 15 deletions

diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py
index e337c54db..f89ce86f9 100755
--- a/scripts/asciidoc2html.py
+++ b/scripts/asciidoc2html.py
@@ -218,21 +218,16 @@ class AsciiDoc:
         if self._asciidoc is not None:
             return self._asciidoc
 
-        try:
-            subprocess.run(['asciidoc'], stdout=subprocess.DEVNULL,
-                           stderr=subprocess.DEVNULL, check=True)
-        except OSError:
-            pass
-        else:
-            return ['asciidoc']
-
-        try:
-            subprocess.run(['asciidoc.py'], stdout=subprocess.DEVNULL,
-                           stderr=subprocess.DEVNULL, check=True)
-        except OSError:
-            pass
-        else:
-            return ['asciidoc.py']
+        for executable in ['asciidoc', 'asciidoc.py']:
+            try:
+                subprocess.run([executable, '--version'],
+                               stdout=subprocess.DEVNULL,
+                               stderr=subprocess.DEVNULL,
+                               check=True)
+            except OSError:
+                pass
+            else:
+                return [executable]
 
         raise FileNotFoundError