#453 Don't silently return nil from find_command when raise_on_error …

…is true
asciidoctor · Jan 26, 2024 · 004d85a · 004d85a
1 parent d5ea6df
commit 004d85a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -1,5 +1,11 @@
 = Asciidoctor-diagram Changelog
 
+== 2.2.16
+
+Bugfixes::
+
+* Issue #453: Avoid internal error when WaveDrom cannot be located
+
 == 2.2.15
 
 Enhacements::

diff --git a/lib/asciidoctor-diagram/diagram_source.rb b/lib/asciidoctor-diagram/diagram_source.rb
@@ -138,9 +138,10 @@ def find_command(cmd, options = {})
 
           config[cmd_var] = cmd_path
 
-          if cmd_path.nil? && options.fetch(:raise_on_error, true)
-            raise "Could not find the #{cmd_names.map { |c| "'#{c}'" }.join(', ')} executable in PATH; add it to the PATH or specify its location using the '#{attr_names[0]}' document attribute"
-          end
+        end
+
+        if cmd_path.nil? && options.fetch(:raise_on_error, true)
+          raise "Could not find the #{cmd_names.map { |c| "'#{c}'" }.join(', ')} executable in PATH; add it to the PATH or specify its location using the '#{attr_names[0]}' document attribute"
         end
 
         cmd_path