diff --git a/kibot/__main__.py b/kibot/__main__.py index 8d6bc169..cbdd0685 100644 --- a/kibot/__main__.py +++ b/kibot/__main__.py @@ -231,9 +231,11 @@ def detect_kicad(): GS.kicad_plugins_dirs.append(os.path.join(home, '.kicad', 'scripting')) GS.kicad_plugins_dirs.append(os.path.join(home, '.kicad', 'scripting', 'plugins')) if GS.kicad_version_major >= 6: - # KiCad 6.0 PCM ver_dir = str(GS.kicad_version_major)+'.'+str(GS.kicad_version_minor) - GS.kicad_plugins_dirs.append(os.path.join(home, '.local', 'share', 'kicad', ver_dir, '3rdparty', 'plugins')) + local_share = os.path.join(home, '.local', 'share', 'kicad', ver_dir) + GS.kicad_plugins_dirs.append(os.path.join(local_share, 'scripting')) + GS.kicad_plugins_dirs.append(os.path.join(local_share, 'scripting', 'plugins')) + GS.kicad_plugins_dirs.append(os.path.join(local_share, '3rdparty', 'plugins')) # KiCad 6.0 PCM if GS.debug_level > 1: logger.debug('KiCad config path {}'.format(GS.kicad_conf_path)) diff --git a/kibot/out_ibom.py b/kibot/out_ibom.py index fd17517c..82dde23e 100644 --- a/kibot/out_ibom.py +++ b/kibot/out_ibom.py @@ -13,6 +13,7 @@ Dependencies: plugin_dirs: - InteractiveHtmlBom - InteractiveHtmlBom/InteractiveHtmlBom + - org_openscopeproject_InteractiveHtmlBom - org_openscopeproject_InteractiveHtmlBom/InteractiveHtmlBom version: 2.4.1.4 downloader: pytool diff --git a/src/kibot-check b/src/kibot-check index ae678d42..f8f39723 100755 --- a/src/kibot-check +++ b/src/kibot-check @@ -184,6 +184,7 @@ deps = '{\ "plugin_dirs": [\ "InteractiveHtmlBom",\ "InteractiveHtmlBom/InteractiveHtmlBom",\ + "org_openscopeproject_InteractiveHtmlBom",\ "org_openscopeproject_InteractiveHtmlBom/InteractiveHtmlBom"\ ],\ "pypi_name": "Interactive HTML BoM",\ @@ -1046,7 +1047,10 @@ if kicad_ok: if kicad_version[0] >= 6 and home: # KiCad 6.0 PCM ver_dir = str(kicad_version[0])+'.'+str(kicad_version[1]) - kicad_plugins_dirs.append(os.path.join(home, '.local', 'share', 'kicad', ver_dir, '3rdparty', 'plugins')) + local_share = os.path.join(home, '.local', 'share', 'kicad', ver_dir) + kicad_plugins_dirs.append(os.path.join(local_share, 'scripting')) + kicad_plugins_dirs.append(os.path.join(local_share, 'scripting', 'plugins')) + kicad_plugins_dirs.append(os.path.join(local_share, '3rdparty', 'plugins')) # KiCad 6.0 PCM except: version = 'Older than 5.1.6' else: diff --git a/src/kibot-check.in b/src/kibot-check.in index 476e3009..3935e34e 100755 --- a/src/kibot-check.in +++ b/src/kibot-check.in @@ -328,7 +328,10 @@ if kicad_ok: if kicad_version[0] >= 6 and home: # KiCad 6.0 PCM ver_dir = str(kicad_version[0])+'.'+str(kicad_version[1]) - kicad_plugins_dirs.append(os.path.join(home, '.local', 'share', 'kicad', ver_dir, '3rdparty', 'plugins')) + local_share = os.path.join(home, '.local', 'share', 'kicad', ver_dir) + kicad_plugins_dirs.append(os.path.join(local_share, 'scripting')) + kicad_plugins_dirs.append(os.path.join(local_share, 'scripting', 'plugins')) + kicad_plugins_dirs.append(os.path.join(local_share, '3rdparty', 'plugins')) # KiCad 6.0 PCM except: version = 'Older than 5.1.6' else: