change install dir preferences

priorities: /opt/homebrew/share then /usr/local/share then /usr/share/ramalama Co-Authored-By: boredsquirrel <[email protected]> Signed-off-by: Eric Curtin <[email protected]>
containers · Sep 26, 2024 · c16ea8b · c16ea8b
1 parent 9331d0f
commit c16ea8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/install.py b/install.py
@@ -90,12 +90,11 @@ def setup_ramalama(bindir, tmp_dir):
     to_file = os.path.join(tmp_dir, from_file)
     download(url, to_file)
     ramalama_bin = os.path.join(bindir, binfile)
-    syspath = "/usr/share/ramalama"
+    sharedirs = ["/opt/homebrew/share", "/usr/local/share", "/usr/share"]
+    syspath = next((d for d in sharedirs if os.path.exists(d)), None)
+    syspath += "/ramalama"
     if sys.platform == "darwin":
         install_mac_dependencies()
-        sharedirs = ["/opt/homebrew/share", "/usr/local/share"]
-        syspath = next((d for d in sharedirs if os.path.exists(d)), None)
-        syspath += "/ramalama"
 
     subprocess.run(["install", "-m755", "-d", syspath], check=True)
     syspath += "/ramalama"

diff --git a/ramalama.py b/ramalama.py
@@ -7,11 +7,8 @@
 
 
 def main(args):
-    syspath = "/usr/share/ramalama"
-    if sys.platform == "darwin":
-        sharedirs = ["/opt/homebrew/share/ramalama", "/usr/local/share/ramalama"]
-        syspath = next((d for d in sharedirs if os.path.exists(d)), None)
-
+    sharedirs = ["/opt/homebrew/share/ramalama", "/usr/local/share/ramalama", "/usr/share/ramalama"]
+    syspath = next((d for d in sharedirs if os.path.exists(d)), None)
     sys.path.insert(0, syspath)
 
     import ramalama