commit 347043fafd88452c15028e326cbbb978a1a323ec
Author: Koji Yokota <yok...@lyx.org>
Date:   Wed Jun 4 22:35:55 2025 +0900

    Fix the case of checkMacOSapp() == False
---
 lib/configure.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index bc68c10598..cfb03329bd 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -345,6 +345,8 @@ def checkMacOSappInstalled(prog):
     result = checkMacOSapp(prog)
     if result != False:
         return result != ''
+    else:
+        return result
 
 
 def checkMacOSapp(prog):
@@ -1213,15 +1215,19 @@ def checkConverterEntries():
 \converter dia        svg        "dia -e $$o -t svg $$i"       ""''')
     #
     progName = 'draw.io'
-    appPath = checkMacOSapp(progName + ".app") + "/Contents/MacOS"
-    logger.info('appPath = ' + appPath + ', progName = ' + progName)
+    appPath = checkMacOSapp(progName + ".app")
+    if appPath != False:
+        progPaths = [ appPath + "/Contents/MacOS" ]
+    else:
+        progPaths = None
     checkProg('a Draw.io -> Image converter', [ progName ],
         rc_entry = [
             r'''\converter drawio        pdf6        "%% -xf pdf -o $$o --crop 
$$i"    ""
 \converter drawio        png        "%% -xf png -o $$o $$i"    ""
 \converter drawio        jpg        "%% -xf jpg -o $$o $$i"    ""
 \converter drawio        svg        "%% -xf svg -o $$o $$i"    ""
-\converter drawio        docbook5        "%% -xf xml -o $$o $$i"       
"xml"'''], path = [ appPath ])
+\converter drawio        docbook5        "%% -xf xml -o $$o $$i"       "xml"'''
+        ], path = progPaths)
 
     #
     # Actually, this produces EPS, but with a wrong bounding box (usually A4 
or letter).
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to