Merge pull request #108 from OpenSourceBrain/test_jnml

Update jnml install paths for linux
OpenSourceBrain · Jul 26, 2023 · c079c88 · c079c88
2 parents c20db29 + 0d73f10
commit c079c88
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/omv/engines/getjnml.py b/omv/engines/getjnml.py
@@ -18,7 +18,12 @@ def install_jnml():
             try:
                 jnmlpath = os.path.join(os.environ["XDG_DATA_HOME"], "jnml")
             except KeyError:
-                jnmlpath = os.path.join(os.environ["HOME"], ".local/share/jnml")
+                localsharepath = os.path.join(os.environ["HOME"], ".local/share")
+                if os.path.isdir(localsharepath):
+                    jnmlpath = os.path.join(localsharepath, "jnml")
+                else:
+                    jnmlpath = os.path.join(os.environ["HOME"], "jnml")
+
         elif osname == "Darwin":
             jnmlpath = os.path.join(os.environ["HOME"], "Library/jnml")
         else:

diff --git a/omv/engines/jneuroml.py b/omv/engines/jneuroml.py
@@ -25,9 +25,14 @@ def get_environment():
                         os.environ["XDG_DATA_HOME"], "jnml/jNeuroMLJar"
                     )
                 except KeyError as e:
-                    jnmlhome = os.path.join(
-                        os.environ["HOME"], ".local/share/jnml/jNeuroMLJar"
-                    )
+                    localsharepath = os.path.join(os.environ["HOME"], ".local/share")
+                    if os.path.isdir(localsharepath):
+                        jnmlhome = os.path.join(
+                            os.environ["HOME"], ".local/share/jnml/jNeuroMLJar"
+                        )
+                    else:
+                        jnmlhome = os.path.join(os.environ["HOME"], "jnml/jNeuroMLJar")
+
             elif osname == "Darwin":
                 jnmlhome = os.path.join(os.environ["HOME"], "Library/jnml/jNeuroMLJar")
             else: